From 3ddcd0a064e3c0ab8135533e8b681a27c5021d4d Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 25 Jul 2013 12:41:10 +0900 Subject: tests: fix path adjustment for LTLIBINTL --- gettext-tools/ChangeLog | 5 +++++ gettext-tools/configure.ac | 2 ++ gettext-tools/tests/ChangeLog | 12 ++++++++++++ gettext-tools/tests/Makefile.am | 1 - gettext-tools/tests/init.cfg.in | 4 ++++ gettext-tools/tests/lang-bash | 2 +- gettext-tools/tests/lang-c | 3 --- gettext-tools/tests/lang-c++ | 3 --- gettext-tools/tests/lang-objc | 3 --- gettext-tools/tests/lang-sh | 2 +- 10 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 gettext-tools/tests/init.cfg.in diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 13dd874..dbfd99e 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2013-07-25 Daiki Ueno + + tests: fix path adjustment for LTLIBINTL + * configure.ac: Output tests/init.cfg. + 2013-05-29 Stefano Lattarini (tiny change) * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 70cf411..6941d1f 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -549,6 +549,8 @@ AC_CONFIG_FILES([m4/Makefile]) AC_CONFIG_FILES([tests/Makefile]) +AC_CONFIG_FILES([tests/init.cfg]) + AC_CONFIG_FILES([gnulib-tests/Makefile]) AC_OUTPUT diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 3f7e8f8..2aec794 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,15 @@ +2013-07-25 Daiki Ueno + + tests: fix path adjustment for LTLIBINTL + * lang-bash: Add gettext-runtime/src to PATH for gettext.sh. + * lang-sh: Likewise. + * lang-c: Don't set top_builddir here. + * lang-c++: Likewise. + * lang-objc: Likewise. + * Makefile.am (TESTS_ENVIRONMENT): Don't set PATH here. + * init.cfg.in: New file to adjust relative path needed by + LTLIBINTL. + 2013-07-21 Daiki Ueno * Makefile.am (EXTRA_DIST): Add init.sh. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 2e31a4f..90d0b47 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -159,7 +159,6 @@ CHECKER = #CHECKER = valgrind --tool=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \ - PATH=.:../src:../../gettext-runtime/src:$(top_srcdir)/../gettext-runtime/src:$$PATH \ GETTEXT="$(CHECKER) tstgettext" \ NGETTEXT="$(CHECKER) tstngettext" \ XGETTEXT="$(CHECKER) xgettext" \ diff --git a/gettext-tools/tests/init.cfg.in b/gettext-tools/tests/init.cfg.in new file mode 100644 index 0000000..d12a04c --- /dev/null +++ b/gettext-tools/tests/init.cfg.in @@ -0,0 +1,4 @@ +# Variable needed by LTLIBINTL. +top_builddir=../.. + +LTLIBINTL="@LTLIBINTL@" diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash index 01be045..2140ade 100755 --- a/gettext-tools/tests/lang-bash +++ b/gettext-tools/tests/lang-bash @@ -1,5 +1,5 @@ #! /bin/sh -. "${srcdir=.}/init.sh"; path_prepend_ . ../src +. "${srcdir=.}/init.sh"; path_prepend_ . ../src ${top_srcdir=..}/../gettext-runtime/src # Test of gettext facilities in the bash language. # Assumes an fr_FR locale is installed. diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c index b2ce58b..5f564f8 100755 --- a/gettext-tools/tests/lang-c +++ b/gettext-tools/tests/lang-c @@ -43,9 +43,6 @@ int main (int argc, char *argv[]) } EOF -# Variable needed by LTLIBINTL. -top_builddir=../.. - tmpfiles="$tmpfiles l-c-prog.${OBJEXT} l-c-prog${EXEEXT}" # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index 4cc12fb..5be141a 100755 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -60,9 +60,6 @@ int main (int argc, char *argv[]) } EOF -# Variable needed by LTLIBINTL. -top_builddir=../.. - tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}" # Compile in two steps from .cc to .o and from .o to 'l-c++-prog'. This way, # relinking is faster because doesn't need to redo the first step. diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc index cc04b48..cc5524a 100755 --- a/gettext-tools/tests/lang-objc +++ b/gettext-tools/tests/lang-objc @@ -59,9 +59,6 @@ int main (int argc, char *argv[]) } EOF -# Variable needed by LTLIBINTL. -top_builddir=../.. - tmpfiles="$tmpfiles l-objc-prog.${OBJEXT} l-objc-prog${EXEEXT}" # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh index 794d8b3..6cf43f6 100755 --- a/gettext-tools/tests/lang-sh +++ b/gettext-tools/tests/lang-sh @@ -1,5 +1,5 @@ #! /bin/sh -. "${srcdir=.}/init.sh"; path_prepend_ . ../src +. "${srcdir=.}/init.sh"; path_prepend_ . ../src ${top_srcdir=..}/../gettext-runtime/src # Test of gettext facilities in the sh language. # Assumes an fr_FR locale is installed. -- cgit v1.1