tests: fix path adjustment for LTLIBINTL

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 13dd874412460a8c3eb381a1a0e6252413ab5fad..dbfd99e78ef26510a32d606c1026c849e55d52e7 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-25  Daiki Ueno  <ueno@gnu.org>
+
+       tests: fix path adjustment for LTLIBINTL
+       * configure.ac: Output tests/init.cfg.
+
 2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
 
        * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 70cf41119bcd2c0c4654f1fded14e2b3ad2e6c40..6941d1f2ae90e5b83f83ae2d3ee64f68a51decb8 100644 (file)
--- 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 3f7e8f836523467361d806faeb147e0331f75f60..2aec794fc0d2feab69c17bcc5996c2d9d9984f04 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-25  Daiki Ueno  <ueno@gnu.org>
+
+       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  <ueno@gnu.org>
 
        * Makefile.am (EXTRA_DIST): Add init.sh.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 2e31a4f11442d0bf1bfb382cfffc80af5721c6dc..90d0b47a37cadc8106503c78bbac85346dd72072 100644 (file)
--- 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 (file)
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 01be04517eba22be832f28530b60c2016db39ce0..2140adeee37e4fc97c755f90a030ddcb947ec239 100755 (executable)
--- 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 b2ce58bf85a29527cebfa9e882ff43609e32ec45..5f564f8d06ffb7d06050f94837467caefb632ee2 100755 (executable)
--- 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 4cc12fb1073ed2277569199eac1d8757cbdb8233..5be141afea897e3561e751d1d0f6e38c7686c441 100755 (executable)
--- 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 cc04b48776e4ce643fa044d207cb9fff342ffb8b..cc5524a0795ae6b7781bf84cd1f4a39846865aa8 100755 (executable)
--- 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 794d8b34a719fe89902c1d33422879059a2ae3f9..6cf43f6e0de3326a93fae624ee001b2cd9e1d537 100755 (executable)
--- 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.