gettext-tools: convert tests to use init.sh from Gnulib

diff --git a/ChangeLog b/ChangeLog
index 6a96e1b828a28b3f29b168be6f7b2fc5e2c1d8de..4da5b809caf734ce5bccb907d05f02e209f81215 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-10  Daiki Ueno  <ueno@gnu.org>
+
+       gettext-tools: convert tests to use init.sh from Gnulib
+       * autogen.sh: Copy tests/init.sh from Gnulib into gettext-tools/tests.
+
 2013-07-07  Daiki Ueno  <ueno@gnu.org>
 
        * NEWS: Mention libasprintf change and Tcl bug fix.

diff --git a/autogen.sh b/autogen.sh
index a1033b6519ff5fae508f8a520a751b658afac772..0132208901feb655de2babc8eaa7dcae654ed37f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -378,6 +378,7 @@ if ! $skip_gnulib; then
     '
     $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
       --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER
+    $GNULIB_TOOL --copy-file tests/init.sh gettext-tools
   fi
 fi
 

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f5dba31fb7f6b2fc493d4b15593e3e9123ec2eaf..40cf531360f570d64f298133e349514a5b28826b 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-10  Daiki Ueno  <ueno@gnu.org>
+
+       gettext-tools: convert tests to use init.sh from Gnulib
+       * Makefile.am (TESTS_ENVIRONMENT): Don't define LIBTOOL envvar
+       since it contains a relative path which cannot easily modified by
+       init.sh-using tests.  Set it in the tests instead.
+       * *: convert to use init.sh.
+
 2013-07-07  Daiki Ueno  <ueno@gnu.org>
 
        * lang-javascript: Fix gjs module checks.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 37e7bbc6ffdb1b34ddd2e7d126f98de596074876..d4f2584367d57eaa2e0e03da5a1be6c5ce4bc976 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -179,7 +179,6 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
                    MSGUNIQ="$(CHECKER) msguniq" \
                    RECODE="$(CHECKER) recode" \
                    OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
-                   LIBTOOL='@LIBTOOL@' \
                    CC='@CC@' CFLAGS='@CFLAGS@' \
                    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
                    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \

diff --git a/gettext-tools/tests/format-awk-1 b/gettext-tools/tests/format-awk-1
index 3228eb16eceba9392c6589b1395a1b78ab11b5ab..21707652056382189bbd1f3e22c2e9e545162346 100755 (executable)
--- a/gettext-tools/tests/format-awk-1
+++ b/gettext-tools/tests/format-awk-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of awk format strings.
 

diff --git a/gettext-tools/tests/format-awk-2 b/gettext-tools/tests/format-awk-2
index f16ec3f3cd52e5593a099019266b7e29171ba308..6f4870b7a7ec717f79e785f80a83a1c6079581c8 100755 (executable)
--- a/gettext-tools/tests/format-awk-2
+++ b/gettext-tools/tests/format-awk-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of awk format strings.
 

diff --git a/gettext-tools/tests/format-boost-1 b/gettext-tools/tests/format-boost-1
index 34009c433685ced1207531f8622b18210bdd61ba..2ab97a674fde57f4e5cbcd0c00a5c292a9120cf2 100755 (executable)
--- a/gettext-tools/tests/format-boost-1
+++ b/gettext-tools/tests/format-boost-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Boost format strings.
 

diff --git a/gettext-tools/tests/format-boost-2 b/gettext-tools/tests/format-boost-2
index aebdd52962c2e5af41dfcfdf1f99c25bfdaa2f2d..1c7340ff58b1421bf1c0fe2fa101e71dcff3b90e 100755 (executable)
--- a/gettext-tools/tests/format-boost-2
+++ b/gettext-tools/tests/format-boost-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Boost format strings.
 

diff --git a/gettext-tools/tests/format-c-1 b/gettext-tools/tests/format-c-1
index 93115a6e8ee32891f26bafb96a220a59e2dc2afa..01d93628536c6ea5d3c87532024b711cdc99cad2 100755 (executable)
--- a/gettext-tools/tests/format-c-1
+++ b/gettext-tools/tests/format-c-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of C format strings.
 

diff --git a/gettext-tools/tests/format-c-2 b/gettext-tools/tests/format-c-2
index 2f68a6332adf3e05c8b2f6ecfec13ad2b6736b5b..7c47c193f41019a72d770c550d0d6d5c5c6420f5 100755 (executable)
--- a/gettext-tools/tests/format-c-2
+++ b/gettext-tools/tests/format-c-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of C format strings.
 

diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index 1e984227442932a029147b1a6c369a4a24fc4047..9c8082bb408c32ceac3bf64166500c852af83a7c 100755 (executable)
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles fc3.tmp fc3.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc3.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-3-prg.c
+${XGETTEXT} -o fc3.tmp --omit-header --no-location ../${srcdir}/format-c-3-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -47,7 +48,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 : ${DIFF=diff}
 ${DIFF} fc3-de.po fc3-de.po.un || exit 1
 
-LANGUAGE= ./fc3 de_DE
+LANGUAGE= ../fc3 de_DE
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index aef04d5e0ff00d7faee62e72c5f938e41cb71ef9..6a34a84f416eceaa25a294b5b6136c5267ff816f 100755 (executable)
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives with plural forms.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles fc4.tmp fc4.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc4.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-4-prg.c
+${XGETTEXT} -o fc4.tmp --omit-header --no-location ../${srcdir}/format-c-4-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -51,7 +52,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 : ${DIFF=diff}
 ${DIFF} fc4-de.po fc4-de.po.un || exit 1
 
-LANGUAGE= ./fc4 de_DE
+LANGUAGE= ../fc4 de_DE
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 666aea243a29c629be3276c5a214b42904c56a8d..997d4d6a880a01412930fe5f23fc815951a63fe3 100755 (executable)
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test 'I' format directive flag.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles fc5.tmp fc5.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc5.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-5-prg.c
+${XGETTEXT} -o fc5.tmp --omit-header --no-location ../${srcdir}/format-c-5-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -47,7 +48,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 : ${DIFF=diff}
 ${DIFF} fa.po fa.po.un || exit 1
 
-LANGUAGE= ./fc5 fa_IR
+LANGUAGE= ../fc5 fa_IR
 case $? in
   0) ;;
   77)

diff --git a/gettext-tools/tests/format-csharp-1 b/gettext-tools/tests/format-csharp-1
index c6ed6068e0348112586b1988a7a34e60ec96e982..9db113443d3b6f2893941641e72da3f4ebf5e617 100755 (executable)
--- a/gettext-tools/tests/format-csharp-1
+++ b/gettext-tools/tests/format-csharp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of C# format strings.
 

diff --git a/gettext-tools/tests/format-csharp-2 b/gettext-tools/tests/format-csharp-2
index 9180bc1c4c408618161679e87ed92f5761a4db0f..4cc8bebd58278fe5b6f32fa977f65f7e4b80744b 100755 (executable)
--- a/gettext-tools/tests/format-csharp-2
+++ b/gettext-tools/tests/format-csharp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Java format strings.
 

diff --git a/gettext-tools/tests/format-elisp-1 b/gettext-tools/tests/format-elisp-1
index 0c7c4c9caa1629f31d5de0ca737a534dc2309c99..1d7289a1df5fc97a20310c848c246a40d25f2d8b 100755 (executable)
--- a/gettext-tools/tests/format-elisp-1
+++ b/gettext-tools/tests/format-elisp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Emacs Lisp format strings.
 

diff --git a/gettext-tools/tests/format-elisp-2 b/gettext-tools/tests/format-elisp-2
index e5516e2566f14e14d13c54fa813cc37d3526e236..dde86c385b5e9abed058e5da5ee0611c55fc7131 100755 (executable)
--- a/gettext-tools/tests/format-elisp-2
+++ b/gettext-tools/tests/format-elisp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Emacs Lisp format strings.
 

diff --git a/gettext-tools/tests/format-gcc-internal-1 b/gettext-tools/tests/format-gcc-internal-1
index 3bd8f35b3a510bf0d66c3874efc835f5b2a708e4..54fef564ea2a5da11e9263225495b007b828319e 100755 (executable)
--- a/gettext-tools/tests/format-gcc-internal-1
+++ b/gettext-tools/tests/format-gcc-internal-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of GCC internal format strings.
 

diff --git a/gettext-tools/tests/format-gcc-internal-2 b/gettext-tools/tests/format-gcc-internal-2
index 55725d135b5a832cb157a8e3e06feb5152a65913..a5f92c01e08c3e56cc7062641850facdd97d321c 100755 (executable)
--- a/gettext-tools/tests/format-gcc-internal-2
+++ b/gettext-tools/tests/format-gcc-internal-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of GCC internal format strings.
 

diff --git a/gettext-tools/tests/format-gfc-internal-1 b/gettext-tools/tests/format-gfc-internal-1
index 42bf8a07775b0fb73ef657bed92ae73202878d80..69ef28bc1397679a0f1625adec354b2b61fb988d 100755 (executable)
--- a/gettext-tools/tests/format-gfc-internal-1
+++ b/gettext-tools/tests/format-gfc-internal-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of GFC internal format strings.
 

diff --git a/gettext-tools/tests/format-gfc-internal-2 b/gettext-tools/tests/format-gfc-internal-2
index 3332e5388fc2859b13be4c832f3eccdd5b59f4df..42c1b30c38fa45e512c89785c54a976486db31fd 100755 (executable)
--- a/gettext-tools/tests/format-gfc-internal-2
+++ b/gettext-tools/tests/format-gfc-internal-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of GFC internal format strings.
 

diff --git a/gettext-tools/tests/format-java-1 b/gettext-tools/tests/format-java-1
index 697c683ae6322dc955626b71b5051c895b5592c8..6a694b493ae79257e5e2f2d5c919e75e1b001112 100755 (executable)
--- a/gettext-tools/tests/format-java-1
+++ b/gettext-tools/tests/format-java-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Java format strings.
 

diff --git a/gettext-tools/tests/format-java-2 b/gettext-tools/tests/format-java-2
index c7e1b605ef6ffc19c5980a0ec4d6257a807eb47a..580bddcc939d3bc783b6108918da045bc519d5b8 100755 (executable)
--- a/gettext-tools/tests/format-java-2
+++ b/gettext-tools/tests/format-java-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Java format strings.
 

diff --git a/gettext-tools/tests/format-javascript-1 b/gettext-tools/tests/format-javascript-1
index f632d1a2cfedd2da0b9a97176155f6a9ef089e0e..f747aabbdbebe9e8d98bdf7fee707e223f27f123 100755 (executable)
--- a/gettext-tools/tests/format-javascript-1
+++ b/gettext-tools/tests/format-javascript-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of JavaScript format strings.
 

diff --git a/gettext-tools/tests/format-javascript-2 b/gettext-tools/tests/format-javascript-2
index 3dfcfc821f3d0c04cfa02186cdd7d00a78487eeb..6a9642db64ddc216487115e90368f82dd9559bee 100755 (executable)
--- a/gettext-tools/tests/format-javascript-2
+++ b/gettext-tools/tests/format-javascript-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of JavaScript format strings.
 

diff --git a/gettext-tools/tests/format-kde-1 b/gettext-tools/tests/format-kde-1
index f916b3faaf8e675ce33690fd91e915d229412834..5752c63f80142b06693f424f4a8ebe878d4c79b7 100755 (executable)
--- a/gettext-tools/tests/format-kde-1
+++ b/gettext-tools/tests/format-kde-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of KDE format strings.
 

diff --git a/gettext-tools/tests/format-kde-2 b/gettext-tools/tests/format-kde-2
index 423fcefb538934fa385345c19b1b2f01d2adca93..9b9bb98dfa8f43d4006681d76a04bef1ecadeaff 100755 (executable)
--- a/gettext-tools/tests/format-kde-2
+++ b/gettext-tools/tests/format-kde-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of KDE format strings.
 

diff --git a/gettext-tools/tests/format-librep-1 b/gettext-tools/tests/format-librep-1
index ddf97c3b0ebbc10431a53123f9cee3f9b2b39c6f..0fe2ec14502a9a27bd48a895211adbc015579486 100755 (executable)
--- a/gettext-tools/tests/format-librep-1
+++ b/gettext-tools/tests/format-librep-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of librep format strings.
 

diff --git a/gettext-tools/tests/format-librep-2 b/gettext-tools/tests/format-librep-2
index 05d26ab3ab7cc157e1b45b5ded54851df2fad522..52db5382e0b8274cecace35353df5af7ca49667f 100755 (executable)
--- a/gettext-tools/tests/format-librep-2
+++ b/gettext-tools/tests/format-librep-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of librep format strings.
 

diff --git a/gettext-tools/tests/format-lisp-1 b/gettext-tools/tests/format-lisp-1
index d23256c9f53baf8eb9e7bb1f37722d190d616318..81ae3d518e5b9827d048472f2eaf5a9401fa448c 100755 (executable)
--- a/gettext-tools/tests/format-lisp-1
+++ b/gettext-tools/tests/format-lisp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Lisp format strings.
 

diff --git a/gettext-tools/tests/format-lisp-2 b/gettext-tools/tests/format-lisp-2
index 6ad8ddd5324b686cbe0e23b22c3e340e41b0dc09..7bc35e0a43006715801f6959ece4aeb747ad4843 100755 (executable)
--- a/gettext-tools/tests/format-lisp-2
+++ b/gettext-tools/tests/format-lisp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Lisp format strings.
 

diff --git a/gettext-tools/tests/format-lua-1 b/gettext-tools/tests/format-lua-1
index 722a6e09516ef6d2ae21fe914ba6375d7c3e3254..42b8515488836bc864f811575a2fca37a7323375 100755 (executable)
--- a/gettext-tools/tests/format-lua-1
+++ b/gettext-tools/tests/format-lua-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Lua format strings.
 

diff --git a/gettext-tools/tests/format-lua-2 b/gettext-tools/tests/format-lua-2
index 6e38bf60ff2c26f25fb4d60a6d1cfec22d5c0801..17e32cc72a6a33437aff743e1f79ccf0074deb8d 100755 (executable)
--- a/gettext-tools/tests/format-lua-2
+++ b/gettext-tools/tests/format-lua-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python format strings.
 

diff --git a/gettext-tools/tests/format-pascal-1 b/gettext-tools/tests/format-pascal-1
index 1439c283d6defe57892adc704f79fde68d900414..4d2875be0f88946fa9d3d0eb4e7aa0a718a91312 100755 (executable)
--- a/gettext-tools/tests/format-pascal-1
+++ b/gettext-tools/tests/format-pascal-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Object Pascal format strings.
 

diff --git a/gettext-tools/tests/format-pascal-2 b/gettext-tools/tests/format-pascal-2
index 8f6cefe47fd470dfd0d08c0b14085a485a0c1814..a0967fd9f9d3f0c8fca5ff262b31ec314a565f77 100755 (executable)
--- a/gettext-tools/tests/format-pascal-2
+++ b/gettext-tools/tests/format-pascal-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Object Pascal format strings.
 

diff --git a/gettext-tools/tests/format-perl-1 b/gettext-tools/tests/format-perl-1
index 878a7ed5ab43251f51ba89dc6b46b6a2b78de88e..cf666b239248a8e4c49e98011c2082ded5c67e15 100755 (executable)
--- a/gettext-tools/tests/format-perl-1
+++ b/gettext-tools/tests/format-perl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl format strings.
 

diff --git a/gettext-tools/tests/format-perl-2 b/gettext-tools/tests/format-perl-2
index 9382fd7c0631c83b783a57022a93f68c2418dd12..12f0d70905669d18a1d5476a8ad3eee42619c3d1 100755 (executable)
--- a/gettext-tools/tests/format-perl-2
+++ b/gettext-tools/tests/format-perl-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl format strings.
 

diff --git a/gettext-tools/tests/format-perl-brace-1 b/gettext-tools/tests/format-perl-brace-1
index e78266f691d320ebdd839d8933d61276e8a5125b..23ec18550cf750b91ab72bb456eeef7b5078539a 100755 (executable)
--- a/gettext-tools/tests/format-perl-brace-1
+++ b/gettext-tools/tests/format-perl-brace-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl brace format strings.
 

diff --git a/gettext-tools/tests/format-perl-brace-2 b/gettext-tools/tests/format-perl-brace-2
index c00636bfac577a0e166f2825ac79b8bbbc555a4a..3654f6aa37698181254bba74b56b8800f6e08254 100755 (executable)
--- a/gettext-tools/tests/format-perl-brace-2
+++ b/gettext-tools/tests/format-perl-brace-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl brace format strings.
 

diff --git a/gettext-tools/tests/format-perl-mixed-1 b/gettext-tools/tests/format-perl-mixed-1
index 89147088c7a983953eedb8a53b6fafefad716dd1..ffbdf264a1d08cef6ae8c7538bca138322ede7bd 100755 (executable)
--- a/gettext-tools/tests/format-perl-mixed-1
+++ b/gettext-tools/tests/format-perl-mixed-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl format strings of both kinds (printf and brace).
 # This test is for the combination of both kinds.

diff --git a/gettext-tools/tests/format-perl-mixed-2 b/gettext-tools/tests/format-perl-mixed-2
index 09afbbb5b99ff29b9c2db3c677a0f4e5591c5e37..5337eb9880144a64191e587a50ac56b5b2cb5348 100755 (executable)
--- a/gettext-tools/tests/format-perl-mixed-2
+++ b/gettext-tools/tests/format-perl-mixed-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl format strings.
 # This test is for the combination of printf and brace format strings.

diff --git a/gettext-tools/tests/format-php-1 b/gettext-tools/tests/format-php-1
index 9efb3a5416138280228320dd2e88f36ce1ec47ea..2763040eec199d16808975036568ea5d5ca3c652 100755 (executable)
--- a/gettext-tools/tests/format-php-1
+++ b/gettext-tools/tests/format-php-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of PHP format strings.
 

diff --git a/gettext-tools/tests/format-php-2 b/gettext-tools/tests/format-php-2
index 83c46e97b528538fbcfa76a531fc257cfdb8036c..9ff7342ae1b6085bb2ceee886e537d8457286966 100755 (executable)
--- a/gettext-tools/tests/format-php-2
+++ b/gettext-tools/tests/format-php-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of PHP format strings.
 

diff --git a/gettext-tools/tests/format-python-1 b/gettext-tools/tests/format-python-1
index 27236973b09918e7dc911f1a908e9a817f734861..7b87cdac3bff8b012b3312263c003d25cf5e46d4 100755 (executable)
--- a/gettext-tools/tests/format-python-1
+++ b/gettext-tools/tests/format-python-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Python format strings.
 

diff --git a/gettext-tools/tests/format-python-2 b/gettext-tools/tests/format-python-2
index 3d9d2080bcb55d992f9fb09a0d0cd3b396a75c94..8b5558e32d743123f2e83a83f94a4f8b5a1c3947 100755 (executable)
--- a/gettext-tools/tests/format-python-2
+++ b/gettext-tools/tests/format-python-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python format strings.
 

diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1
index 1c4f46843ca9d7aa4dad027d93b943f1af4a574c..057114b2b889d275cd688108ebc14bf800f2b095 100755 (executable)
--- a/gettext-tools/tests/format-python-brace-1
+++ b/gettext-tools/tests/format-python-brace-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Python brace format strings.
 

diff --git a/gettext-tools/tests/format-python-brace-2 b/gettext-tools/tests/format-python-brace-2
index 9f8f8beb1c6e9c05a151cf2afd12d78716dd4af2..a40b0529dcc462ff98410c984e7d1b8cc3506d2e 100755 (executable)
--- a/gettext-tools/tests/format-python-brace-2
+++ b/gettext-tools/tests/format-python-brace-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python brace format strings.
 

diff --git a/gettext-tools/tests/format-qt-1 b/gettext-tools/tests/format-qt-1
index e2207bc322cd79c3b00832b4708a945c23e9c6c4..fe4e04dc679cbbf0fcb78efdbd8746148a5db41a 100755 (executable)
--- a/gettext-tools/tests/format-qt-1
+++ b/gettext-tools/tests/format-qt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Qt format strings.
 

diff --git a/gettext-tools/tests/format-qt-2 b/gettext-tools/tests/format-qt-2
index 0f8005e2cdeb153eb81ec2c4d80b1fe5ff52839d..bd720c791916ed0f2aac4b82fad5e5dd3ad1ba1f 100755 (executable)
--- a/gettext-tools/tests/format-qt-2
+++ b/gettext-tools/tests/format-qt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Qt format strings.
 

diff --git a/gettext-tools/tests/format-qt-plural-1 b/gettext-tools/tests/format-qt-plural-1
index 6f91d85f65e6a5b9353af5e49c5a96777ac56ded..4393ba61df7471d97c7369c6fc8f0d6b8a4b9317 100755 (executable)
--- a/gettext-tools/tests/format-qt-plural-1
+++ b/gettext-tools/tests/format-qt-plural-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Qt plural format strings.
 

diff --git a/gettext-tools/tests/format-qt-plural-2 b/gettext-tools/tests/format-qt-plural-2
index 2fed07b0d7b61ebb79fbfa9a78dc593b98dfabfa..48d61c15cd979dd051cf2cb9e9762c8cd8094556 100755 (executable)
--- a/gettext-tools/tests/format-qt-plural-2
+++ b/gettext-tools/tests/format-qt-plural-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Qt plural format strings.
 

diff --git a/gettext-tools/tests/format-scheme-1 b/gettext-tools/tests/format-scheme-1
index 753ddf0ee8b8e6e82ff5eb2730102363b7548164..741cd75b2c22d3f4fd7a71ae58529053192657d5 100755 (executable)
--- a/gettext-tools/tests/format-scheme-1
+++ b/gettext-tools/tests/format-scheme-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Scheme format strings.
 

diff --git a/gettext-tools/tests/format-scheme-2 b/gettext-tools/tests/format-scheme-2
index 0be970f271ce6aeed369997232ac00fda4146b04..43f01fc1619d2d8a36fa8823435730ca860d8f17 100755 (executable)
--- a/gettext-tools/tests/format-scheme-2
+++ b/gettext-tools/tests/format-scheme-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Lisp format strings.
 

diff --git a/gettext-tools/tests/format-sh-1 b/gettext-tools/tests/format-sh-1
index 6bbb32f9537d109efb798829386980a9680e68ab..6a8f565cb88ee044df24a46cc8951d838388ad71 100755 (executable)
--- a/gettext-tools/tests/format-sh-1
+++ b/gettext-tools/tests/format-sh-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Shell format strings.
 

diff --git a/gettext-tools/tests/format-sh-2 b/gettext-tools/tests/format-sh-2
index cf8bbf0f76d5a283ba3d826c5646be3d79735d07..453b19c2b1a934969e07d231f7452a60454f283e 100755 (executable)
--- a/gettext-tools/tests/format-sh-2
+++ b/gettext-tools/tests/format-sh-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Shell format strings.
 

diff --git a/gettext-tools/tests/format-tcl-1 b/gettext-tools/tests/format-tcl-1
index 02e0cd2826709279ee5f7bc56d525dd8782ff8b4..f5d0fab3d8f842642e165f2a6047ffd174a678d0 100755 (executable)
--- a/gettext-tools/tests/format-tcl-1
+++ b/gettext-tools/tests/format-tcl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Tcl format strings.
 

diff --git a/gettext-tools/tests/format-tcl-2 b/gettext-tools/tests/format-tcl-2
index fa8d09ac05aaea7004ce71fae8d948a162a4ac5b..a76b215774b1abbcd415fa6aea1c5cffd046aec4 100755 (executable)
--- a/gettext-tools/tests/format-tcl-2
+++ b/gettext-tools/tests/format-tcl-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Tcl format strings.
 

diff --git a/gettext-tools/tests/format-ycp-1 b/gettext-tools/tests/format-ycp-1
index 8cd994122f0261de34caf6b4765d8357245bce25..9f66e8484f9a24be1336c058e815cf667bf58e08 100755 (executable)
--- a/gettext-tools/tests/format-ycp-1
+++ b/gettext-tools/tests/format-ycp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of YCP format strings.
 

diff --git a/gettext-tools/tests/format-ycp-2 b/gettext-tools/tests/format-ycp-2
index dd6159e38b5d372a9dab6d57da14930807973c75..4b3bd81fd8f9404e181ab0b0d58ce03ecff8d182 100755 (executable)
--- a/gettext-tools/tests/format-ycp-2
+++ b/gettext-tools/tests/format-ycp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of YCP format strings.
 

diff --git a/gettext-tools/tests/gettext-1 b/gettext-tools/tests/gettext-1
index 450a772436bf45c3d460ae86137bb2b00a2c21ac..acc8feea92e39156ce957d9718f3c36611736766 100755 (executable)
--- a/gettext-tools/tests/gettext-1
+++ b/gettext-tools/tests/gettext-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the gettext program with -e option.
 
@@ -9,7 +10,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles gt-1"
 test -d gt-1 || mkdir gt-1
 test -d gt-1/LC_MESSAGES || mkdir gt-1/LC_MESSAGES
-cp $top_srcdir/tests/test.mo gt-1/LC_MESSAGES
+cp ../$srcdir/test.mo gt-1/LC_MESSAGES
 
 tmpfiles="$tmpfiles gt-test1.out"
 : ${GETTEXT=gettext}

diff --git a/gettext-tools/tests/gettext-2 b/gettext-tools/tests/gettext-2
index 62692823f21a325774cbd0d43adec5972b94f678..387816dabb84e858419220496744c710ca7b190a 100755 (executable)
--- a/gettext-tools/tests/gettext-2
+++ b/gettext-tools/tests/gettext-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the gettext program without -e option.
 
@@ -21,7 +22,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles gt-2"
 test -d gt-2 || mkdir gt-2
 test -d gt-2/LC_MESSAGES || mkdir gt-2/LC_MESSAGES
-cp $top_srcdir/tests/test.mo gt-2/LC_MESSAGES
+cp ../$srcdir/test.mo gt-2/LC_MESSAGES
 
 tmpfiles="$tmpfiles gt-test2.out"
 : ${GETTEXT=gettext}

diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index 49a0fbcf444ee7285a0fa9c2dc3086066a729eaa..974afd5a980065ca6fe7967933d7e445fc12277d 100755 (executable)
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() works right even with intermediate
 # setlocale() calls.
@@ -14,7 +15,7 @@ test "$GLIBC2" = yes || {
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
-LC_ALL=de_DE ./testlocale || {
+LC_ALL=de_DE ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE not installed"
   else
@@ -22,7 +23,7 @@ LC_ALL=de_DE ./testlocale || {
   fi
   exit 77
 }
-LC_ALL=fr_FR ./testlocale || {
+LC_ALL=fr_FR ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale fr_FR not installed"
   else
@@ -39,8 +40,8 @@ test -d gt-3/fr_FR || mkdir gt-3/fr_FR
 test -d gt-3/fr_FR/LC_MESSAGES || mkdir gt-3/fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo ${top_srcdir}/tests/gettext-3-1.po
-${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo ${top_srcdir}/tests/gettext-3-2.po
+${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo ../${srcdir}/gettext-3-1.po
+${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo ../${srcdir}/gettext-3-2.po
 
 tmpfiles="$tmpfiles gt-3.ok"
 cat <<EOF > gt-3.ok
@@ -53,7 +54,7 @@ String2 - Another string for testing.
 EOF
 
 tmpfiles="$tmpfiles gt-3.out"
-./gettext-3-prg > gt-3.out || exit 1
+../gettext-3-prg > gt-3.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} gt-3.ok gt-3.out || exit 1

diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4
index fb404e33d766e300ebe248c6e7f75ce08525f9b8..5573e5fffef110dc7d0f8a61ef51bdf45eb4a22f 100755 (executable)
--- a/gettext-tools/tests/gettext-4
+++ b/gettext-tools/tests/gettext-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that bind_textdomain_codeset() works.
 
@@ -12,7 +13,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # a traditional french locale is installed; no need to check also for a
 # traditional german locale.
 : ${LOCALE_FR=fr_FR}
-{ test $LOCALE_FR != none && LC_ALL=$LOCALE_FR ./testlocale; } || {
+{ test $LOCALE_FR != none && LC_ALL=$LOCALE_FR ../testlocale; } || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: no traditional french locale is installed"
   else
@@ -27,9 +28,9 @@ test -d gt-4/fr || mkdir gt-4/fr
 test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo ${top_srcdir}/tests/gettext-4.po
+${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo ../${srcdir}/gettext-4.po
 
-./gettext-4-prg $LOCALE_FR || exit 1
+../gettext-4-prg $LOCALE_FR || exit 1
 
 rm -fr $tmpfiles
 

diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5
index bb76a5d33fc773c360154e2d1af3b1809924bd25..747a98cd698293e8c2e5278de1f38d45f0a5682b 100755 (executable)
--- a/gettext-tools/tests/gettext-5
+++ b/gettext-tools/tests/gettext-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, the gettext() results come out in the correct
 # encoding for locales that differ only in their encoding.
@@ -15,7 +16,7 @@ test "$GLIBC2" = yes || {
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
 # de_DE.UTF-8 locale installed.
-LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
+LC_ALL=de_DE.ISO-8859-1 ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE.ISO-8859-1 not installed"
   else
@@ -23,7 +24,7 @@ LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
   fi
   exit 77
 }
-LC_ALL=de_DE.UTF-8 ./testlocale || {
+LC_ALL=de_DE.UTF-8 ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE.UTF-8 not installed"
   else
@@ -38,9 +39,9 @@ test -d gt-5/de_DE || mkdir gt-5/de_DE
 test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo ${top_srcdir}/tests/gettext-5.po
+${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo ../${srcdir}/gettext-5.po
 
-./gettext-5-prg || exit 1
+../gettext-5-prg || exit 1
 
 rm -fr $tmpfiles
 

diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index 3ec0423732483d12e56217023422166e8eff4a71..331d3203be99ff59c258f398048c60e88c913ac9 100755 (executable)
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() in multithreaded applications works
 # correctly if different threads operate in different locales with the same
@@ -39,8 +40,8 @@ test -d gt-6/fr_FR || mkdir gt-6/fr_FR
 test -d gt-6/fr_FR/LC_MESSAGES || mkdir gt-6/fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-6-1.po
-${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-6-2.po
+${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-6-1.po
+${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-6-2.po
 
 tmpfiles="$tmpfiles gt-6.ok"
 cat <<EOF > gt-6.ok
@@ -51,7 +52,7 @@ beaut
 EOF
 
 tmpfiles="$tmpfiles gt-6.out"
-./gettext-6-prg > gt-6.out
+../gettext-6-prg > gt-6.out
 case $? in
   0) ;;
   77)

diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index 09123cd61f29c942b0dc4bb11fc7fdeeaafd1953..0970df491c0af7ccb176d66744819d66472224d7 100755 (executable)
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() in multithreaded applications works
 # correctly if different threads operate in different locales referring to
@@ -38,10 +39,10 @@ test -d gt-7/de_DE || mkdir gt-7/de_DE
 test -d gt-7/de_DE/LC_MESSAGES || mkdir gt-7/de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-7.po
+${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-7.po
 
 tmpfiles="$tmpfiles gt-7.out"
-./gettext-7-prg > gt-7.out
+../gettext-7-prg > gt-7.out
 case $? in
   0) ;;
   77)

diff --git a/gettext-tools/tests/gettext-8 b/gettext-tools/tests/gettext-8
index 114922df3c5cccab7ed801659c324757dab448a1..5ee22bcab68b589c8c53a23bc99df311353b6911 100755 (executable)
--- a/gettext-tools/tests/gettext-8
+++ b/gettext-tools/tests/gettext-8
@@ -1,5 +1,6 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that gettext() does not crash by stack overflow when msgid is very long.
 
-./gettext-8-prg
+../gettext-8-prg

diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1
index b1b277d5deeb2a2c777f00ff8154f4e2c6e7172d..e40a7eb999e7d0b03a79a4f74fed4de670eba736 100755 (executable)
--- a/gettext-tools/tests/gettextpo-1
+++ b/gettext-tools/tests/gettextpo-1
@@ -1,14 +1,15 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the libgettextpo library.
 tmpfiles="gtpo-1-copied.po gtpo-1-created.po"
-./gettextpo-1-prg${EXEEXT} ${srcdir}/gettextpo-1.de.po > /dev/null
+../gettextpo-1-prg${EXEEXT} ../${srcdir}/gettextpo-1.de.po > /dev/null
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${srcdir}/gettextpo-1.de.po gtpo-1-copied.po
+${DIFF} ../${srcdir}/gettextpo-1.de.po gtpo-1-copied.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${DIFF} ${srcdir}/gettextpo-1.de.po gtpo-1-created.po
+${DIFF} ../${srcdir}/gettextpo-1.de.po gtpo-1-created.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 rm -f $tmpfiles

diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash
index 3510f19bb924b3890a4df8122b1895848c4a1af8..01be04517eba22be832f28530b60c2016db39ce0 100755 (executable)
--- a/gettext-tools/tests/lang-bash
+++ b/gettext-tools/tests/lang-bash
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the bash language.
 # Assumes an fr_FR locale is installed.
@@ -104,7 +105,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -112,7 +113,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index 43fb57f56a8621f9b9ce86604ebe7138c2e5d519..b2ce58bf85a29527cebfa9e882ff43609e32ec45 100755 (executable)
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C language.
 # Assumes an fr_FR locale is installed.
@@ -43,13 +44,14 @@ int main (int argc, char *argv[])
 EOF
 
 # Variable needed by LTLIBINTL.
-top_builddir=..
+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
 # ${CFLAGS} or ${CPPFLAGS}.
-${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-c-prog prog.c ${LTLIBINTL} \
+: ${LIBTOOL=/bin/sh ../../libtool}
+${LIBTOOL} --quiet --mode=link ${CC} -I../.. -I../$top_srcdir/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-c-prog prog.c ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles l-c-prog.tmp l-c-prog.pot"

diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index a14b2235d31ef4c635a840a98d3bbca31ddbcd52..4cc12fb1073ed2277569199eac1d8757cbdb8233 100755 (executable)
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C++ language.
 # Assumes an fr_FR locale is installed.
@@ -60,7 +61,7 @@ int main (int argc, char *argv[])
 EOF
 
 # Variable needed by LTLIBINTL.
-top_builddir=..
+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,
@@ -68,12 +69,13 @@ tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}"
 # Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # is found in the build directory, regardless of -I options present in
 # ${CXXFLAGS} or ${CPPFLAGS}.
-${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c l-c++-prog.cc \
+${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I../$top_srcdir/gnulib-lib -I../../intl ${CXXFLAGS} ${CPPFLAGS} -c l-c++-prog.cc \
   || exit 1
 # Remove the -Wl,--disable-auto-import option here that is added by
 # woe32-dll.m4. Cygwin 1.7.2 does not support it in C++ mode: It gives
 # a link error about 'std::cout'.
-${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
+: ${LIBTOOL=/bin/sh ../../libtool}
+${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} ../../../gettext-runtime/libasprintf/libasprintf.la ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles l-c++-prog.tmp l-c++-prog.pot"

diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index ace3ed53f9f4651ae4f457b2436c73978497ea3f..78ee8ee1f72fac8bd7fda1da035d7a3fb632c932 100755 (executable)
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the CLISP language.
 # Assumes an fr_FR locale is installed.
@@ -109,7 +110,7 @@ clisp -norc -x "(sys::exit #+GETTEXT (not (>= $version 2.28)) #-GETTEXT t)" \
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -117,7 +118,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 0092953a20fa6216de8f9842f2a8addc467e4b9c..0d638984bcb18d4ac7e644ce5f8a060f257dab46 100755 (executable)
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C# language.
 # Assumes an fr_FR locale is installed.
@@ -51,8 +52,8 @@ EOF
 
 tmpfiles="$tmpfiles l-csharp"
 test -d l-csharp || mkdir l-csharp
-: ${CSHARPCOMP="/bin/sh ../csharpcomp.sh"}
-${CSHARPCOMP} -o l-csharp/program.exe -L ../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
+: ${CSHARPCOMP="/bin/sh ../../csharpcomp.sh"}
+${CSHARPCOMP} -o l-csharp/program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
 
 tmpfiles="$tmpfiles l-csharp-prog.tmp l-csharp-prog.pot"
 : ${XGETTEXT=xgettext}
@@ -140,7 +141,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 ${DIFF} l-csharp-fr.po l-csharp-fr.po.new || exit 1
 
 : ${MSGFMT=msgfmt}
-GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
 ${MSGFMT} --csharp -d l-csharp -r prog -l fr l-csharp-fr.po || exit 1
 exit 0
 
@@ -148,7 +149,7 @@ exit 0
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -156,7 +157,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -191,13 +192,13 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${CSHARPEXEC="/bin/sh ../csharpexec.sh"}
+: ${CSHARPEXEC="/bin/sh ../../csharpexec.sh"}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
   ${DIFF} l-csharp-prog.ok l-csharp-prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
   ${DIFF} l-csharp-prog.oku l-csharp-prog.out || exit 1
 fi
 

diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp
index 86a930f532fcb313fcaa7beb02089145ab70e046..7a49ae5496c081d97a46cde62ab3f35ba331763b 100755 (executable)
--- a/gettext-tools/tests/lang-elisp
+++ b/gettext-tools/tests/lang-elisp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Emacs Lisp language.
 

diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index ebf73c4716843f7042648ee9bb8a7e0ed762f8d0..dca67efc3bc6321bd8b46b4c9407add0fdb6a2dd 100755 (executable)
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the GNU awk language.
 # Assumes an fr_FR locale is installed.
@@ -104,7 +105,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -112,7 +113,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 0f8795d795a96b91409b2b1436ef7abc455d97c5..13cb07cdb147f40a965050eaa8be9b67e0ea9f45 100755 (executable)
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the guile implementation of Scheme.
 # Assumes an fr_FR locale is installed.
@@ -103,7 +104,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -111,7 +112,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index ae9e7b0eee17b76f9e210cb7c8f23acc2376ca8d..6e7d194a9ed41851a58eb87ec199dc110c8c12c6 100755 (executable)
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Java language.
 # Assumes an fr_FR locale is installed.
@@ -65,8 +66,8 @@ EOF
 tmpfiles="$tmpfiles Program.class l-java l-java-prog.err"
 test -d l-java || mkdir l-java
 
-: ${JAVACOMP="/bin/sh ../javacomp.sh"}
-CLASSPATH=../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d l-java Program.java 2>l-java-prog.err \
+: ${JAVACOMP="/bin/sh ../../javacomp.sh"}
+CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d l-java Program.java 2>l-java-prog.err \
   || { cat l-java-prog.err 1>&2; exit 1; }
 
 tmpfiles="$tmpfiles l-java-prog.tmp l-java-prog.pot"
@@ -162,7 +163,7 @@ ${MSGFMT} -j -d l-java -r prog -l fr l-java-fr.po || exit 1
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -170,7 +171,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -205,13 +206,13 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${JAVAEXEC="/bin/sh ../javaexec.sh"}
+: ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=l-java:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > l-java-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=l-java:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > l-java-prog.out || exit 1
   ${DIFF} l-java-prog.ok l-java-prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=l-java:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > l-java-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=l-java:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > l-java-prog.out || exit 1
   ${DIFF} l-java-prog.oku l-java-prog.out || exit 1
 fi
 

diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript
index 47abb84fe51385d2f8eea8fe674388eac4c5942f..c53cdf332d28e9e63a48f848f0ebc0575a3fd013 100755 (executable)
--- a/gettext-tools/tests/lang-javascript
+++ b/gettext-tools/tests/lang-javascript
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the JavaScript language.
 # Assumes an fr_FR locale is installed.
@@ -85,7 +86,7 @@ ${MSGFMT} -o l-javascript/fr/LC_MESSAGES/prog.mo l-javascript-fr.po
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -93,7 +94,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index a03c5e167db2aa4a5a5a848797dd4902fea5f977..89743a0c433cca4836d8bc5ede8b6916fef11bdc 100755 (executable)
--- a/gettext-tools/tests/lang-librep
+++ b/gettext-tools/tests/lang-librep
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the librep language.
 # Assumes an fr_FR locale is installed.
@@ -86,7 +87,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -94,7 +95,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-lua b/gettext-tools/tests/lang-lua
index 00648247062745f8834f579b8c885a1abeef028a..3fbe068f9a7cdf060f4dfe5708a88b8c3015e739 100755 (executable)
--- a/gettext-tools/tests/lang-lua
+++ b/gettext-tools/tests/lang-lua
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Lua language.
 # Assumes an fr_FR locale is installed.
@@ -102,7 +103,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -110,7 +111,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 4c73225c750dd6319c04321bc12f053acea67751..cc04b48776e4ce643fa044d207cb9fff342ffb8b 100755 (executable)
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Objective C language.
 # Assumes an fr_FR locale is installed.
@@ -59,13 +60,14 @@ int main (int argc, char *argv[])
 EOF
 
 # Variable needed by LTLIBINTL.
-top_builddir=..
+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
 # ${CFLAGS} or ${CPPFLAGS}.
-${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-prog prog.m ${LTLIBINTL} \
+: ${LIBTOOL=/bin/sh ../../libtool}
+${LIBTOOL} --quiet --mode=link ${CC} -I../.. -I../$top_srcdir/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-prog prog.m ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles l-objc-prog.tmp l-objc-prog.pot"

diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 2b879fe3221ac2527a243a3d0c4aed8f325caf8a..403293766b29c25a6044f99e70bc060464cd1e06 100755 (executable)
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Object Pascal language.
 # Assumes the following packages are installed: fpk.

diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1
index 91ede8abd6994b587c8504922e00c4647f0615af..acea7b638b79a515dc1682b6c5cb6e646e22ec92 100755 (executable)
--- a/gettext-tools/tests/lang-perl-1
+++ b/gettext-tools/tests/lang-perl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Perl language,
 # using printf format strings.

diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2
index 2e7b911bf9b9b7fbfbce0d4990288baadc4736d5..4a1578c314a3273274165b22f28df36805820c46 100755 (executable)
--- a/gettext-tools/tests/lang-perl-2
+++ b/gettext-tools/tests/lang-perl-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Perl language,
 # using brace format strings.

diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index d745b7d03eaea76e6450db8c21d3b6fea6b9b0aa..072392cac61d1b8b8a79695cb1e8034c1f27ede3 100755 (executable)
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the PHP language.
 # Assumes an fr_FR locale is installed.
@@ -89,7 +90,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -97,7 +98,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-po b/gettext-tools/tests/lang-po
index 772914b1333c74258edf9eb821d86a3a49022f31..c37da7e19228b280236e056a4dee14b64ed3456f 100755 (executable)
--- a/gettext-tools/tests/lang-po
+++ b/gettext-tools/tests/lang-po
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the PO/POT format.
 

diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1
index 141115d6cec71c0d13bc50943133f1edfe3a260b..6dff69c4b93152ed27e09e5d73b254c6363ddea1 100755 (executable)
--- a/gettext-tools/tests/lang-python-1
+++ b/gettext-tools/tests/lang-python-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Python language.
 

diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2
index 3a2fa8fbecf105bb8f91fa247a35addcda4ab0ed..770babe9bd8bd2f7262356362c1d69771b961638 100755 (executable)
--- a/gettext-tools/tests/lang-python-2
+++ b/gettext-tools/tests/lang-python-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities (including plural handling) in the Python
 # language.

diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst
index 36b076848cd6d72bc3baf440d73a21ea339bdf8d..baee2db8abc6f152a1cd63bffb841bb4d906ac77 100755 (executable)
--- a/gettext-tools/tests/lang-rst
+++ b/gettext-tools/tests/lang-rst
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the RST format.
 

diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh
index 8d18556bc6b11ed011a3d0cb4668b0d2b6be84cd..794d8b34a719fe89902c1d33422879059a2ae3f9 100755 (executable)
--- a/gettext-tools/tests/lang-sh
+++ b/gettext-tools/tests/lang-sh
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the sh language.
 # Assumes an fr_FR locale is installed.
@@ -90,7 +91,7 @@ ${MSGFMT} -o l-sh/fr/LC_MESSAGES/prog.mo l-sh-fr.po
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -98,7 +99,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index 596ad1755e488d5ba1b3064f90f09fccfcd0ed97..448badf7062d29b834b001ab30e649b1ec772cb6 100755 (executable)
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the GNU smalltalk language.
 # Assumes an fr_FR locale is installed.

diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index 24057204642dc917f02998d5d2270358fad1ff13..4f8416dfcf86f91573ae9ce5b2d28979852500df 100755 (executable)
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Tcl language.
 # Assumes an fr_FR locale is installed.

diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index 2a5950dca192502330456219d2615bed84c4c088..096fd3e3d39199a40a743cf87d4a14ddf3bd3e9f 100644 (file)
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Vala language.
 # Assumes an fr_FR locale is installed.

diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp
index 4ae5e46ecdefd1c00f735ee94410ea91f493a22b..01b9b3aaa4d290181a77e57818c492e0983f40f7 100755 (executable)
--- a/gettext-tools/tests/lang-ycp
+++ b/gettext-tools/tests/lang-ycp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the YCP language.
 

diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1
index 5fec17beb1fb8aa28100a4dd3e8d151f2e89cf45..02ece63b55984a29415622df80773b94476ac433 100755 (executable)
--- a/gettext-tools/tests/msgattrib-1
+++ b/gettext-tools/tests/msgattrib-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --translated option.
 

diff --git a/gettext-tools/tests/msgattrib-10 b/gettext-tools/tests/msgattrib-10
index 3408f37ffbc21d017c50b9dbc004090f6dec8dea..b639ae151bfe8429eb00e4f82a80b0981e913285 100755 (executable)
--- a/gettext-tools/tests/msgattrib-10
+++ b/gettext-tools/tests/msgattrib-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --set-obsolete option. Note that the output routines drop untranslated
 # obsolete messages.

diff --git a/gettext-tools/tests/msgattrib-11 b/gettext-tools/tests/msgattrib-11
index a4c3a22c767ca86063468b5b90f6096809064d14..9184309203b842ac781f1a6fa571f15bea89f60f 100755 (executable)
--- a/gettext-tools/tests/msgattrib-11
+++ b/gettext-tools/tests/msgattrib-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --clear-obsolete option.
 

diff --git a/gettext-tools/tests/msgattrib-12 b/gettext-tools/tests/msgattrib-12
index 681c468f5f03338ca8913fa7f3a595d8d316adfe..a056b29e9ff8e702981ad73e953ef229427b13f8 100755 (executable)
--- a/gettext-tools/tests/msgattrib-12
+++ b/gettext-tools/tests/msgattrib-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --fuzzy option.
 

diff --git a/gettext-tools/tests/msgattrib-13 b/gettext-tools/tests/msgattrib-13
index ec362a9d825349d2ef2abf6fbdbf3281d4597551..90d68c67dedf54fc5b0e2dbbeab8ed4fb2ba2c83 100755 (executable)
--- a/gettext-tools/tests/msgattrib-13
+++ b/gettext-tools/tests/msgattrib-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --obsolete option.
 

diff --git a/gettext-tools/tests/msgattrib-14 b/gettext-tools/tests/msgattrib-14
index 0de21ba0e2a188445d3827d2e9e2991d7971141c..507f83dd0024605c69afd38217e442cf7f69d167 100755 (executable)
--- a/gettext-tools/tests/msgattrib-14
+++ b/gettext-tools/tests/msgattrib-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test combination of selection and manipulation option.
 

diff --git a/gettext-tools/tests/msgattrib-15 b/gettext-tools/tests/msgattrib-15
index d65fc4e038c6f83169e035ef463b27d40ac8a4a1..5ddf085ed89acace4a163b9bb39c7533f357105e 100755 (executable)
--- a/gettext-tools/tests/msgattrib-15
+++ b/gettext-tools/tests/msgattrib-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msgattrib-16 b/gettext-tools/tests/msgattrib-16
index ff8dfdc361347719efd780867027b09aa6100cae..f88b545a625beb817bbf7de3681f3c324ca83fab 100755 (executable)
--- a/gettext-tools/tests/msgattrib-16
+++ b/gettext-tools/tests/msgattrib-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib on a PO file with previous msgids.
 

diff --git a/gettext-tools/tests/msgattrib-17 b/gettext-tools/tests/msgattrib-17
index 0409c3a9ffaa32b8357a1b401f128e92ff317671..22835dcb6bc599f873a20f273ddd749f81c43d3f 100755 (executable)
--- a/gettext-tools/tests/msgattrib-17
+++ b/gettext-tools/tests/msgattrib-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib option --clear-previous.
 

diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2
index aaced02abed5df44491e7cd256a29d607f2329c0..adfcb4ea1e82a03f000ce0a1b1ddc7d18128062c 100755 (executable)
--- a/gettext-tools/tests/msgattrib-2
+++ b/gettext-tools/tests/msgattrib-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --untranslated option.
 

diff --git a/gettext-tools/tests/msgattrib-3 b/gettext-tools/tests/msgattrib-3
index 2d6ca7f2e194da2724890d86b275689cdf909dd7..50bf750688448fad533b63058de3db73df809892 100755 (executable)
--- a/gettext-tools/tests/msgattrib-3
+++ b/gettext-tools/tests/msgattrib-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-fuzzy option.
 

diff --git a/gettext-tools/tests/msgattrib-4 b/gettext-tools/tests/msgattrib-4
index 641d5a6e537d516bbde54c0d8e042636de637300..bf0b47606f6aea6750233af960ab53ca993e9a3a 100755 (executable)
--- a/gettext-tools/tests/msgattrib-4
+++ b/gettext-tools/tests/msgattrib-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --only-fuzzy option.
 

diff --git a/gettext-tools/tests/msgattrib-5 b/gettext-tools/tests/msgattrib-5
index f8728664a2ff43f76e436c383113ef26aa56f13f..f6953a9d75aac7efd79db19cec77254695253440 100755 (executable)
--- a/gettext-tools/tests/msgattrib-5
+++ b/gettext-tools/tests/msgattrib-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-obsolete option.
 

diff --git a/gettext-tools/tests/msgattrib-6 b/gettext-tools/tests/msgattrib-6
index 08f41f6c3e3e69f264f1a2ec8641b156c051cdcb..411e6958f243c6f5884afbd9ef517db0a58e119b 100755 (executable)
--- a/gettext-tools/tests/msgattrib-6
+++ b/gettext-tools/tests/msgattrib-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --only-obsolete option.
 

diff --git a/gettext-tools/tests/msgattrib-7 b/gettext-tools/tests/msgattrib-7
index e0c3ce33bf4b817d89895c826eb25006f37b6c79..8aeed0f127bf2e33f92021e126b5f8b8e2fb9712 100755 (executable)
--- a/gettext-tools/tests/msgattrib-7
+++ b/gettext-tools/tests/msgattrib-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test combination of two selection options.
 

diff --git a/gettext-tools/tests/msgattrib-8 b/gettext-tools/tests/msgattrib-8
index 83a0ca71a025e355419cdb96887a6b6697bc8a0d..d3e356badf238fcefffdaa8510ab73365781791a 100755 (executable)
--- a/gettext-tools/tests/msgattrib-8
+++ b/gettext-tools/tests/msgattrib-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --set-fuzzy option. Note that the output routines ignore the fuzzy
 # attribute for untranslated messages.

diff --git a/gettext-tools/tests/msgattrib-9 b/gettext-tools/tests/msgattrib-9
index 909bad3ef376215ff34532dacc512ad0cc377018..8920b2a729d647ba48807674ed348063be869707 100755 (executable)
--- a/gettext-tools/tests/msgattrib-9
+++ b/gettext-tools/tests/msgattrib-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --clear-fuzzy option.
 

diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1
index fc422004d5763c0c8d64fbe1aa6fbc73b988643a..2286b619d5bf0726bd3257e1a6f9ebbf50615b05 100755 (executable)
--- a/gettext-tools/tests/msgattrib-properties-1
+++ b/gettext-tools/tests/msgattrib-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --translated option with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1
index 0a0da986dd37ee166973651fa99a03ba82e18db4..b4ab0675c2a28224bd71e31e5f80fad8568559b3 100755 (executable)
--- a/gettext-tools/tests/msgcat-1
+++ b/gettext-tools/tests/msgcat-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat doesn't introduce alternative syntax if all translations
 # have the same msgstr.

diff --git a/gettext-tools/tests/msgcat-10 b/gettext-tools/tests/msgcat-10
index 4af252bf726037abd02875be6f8fce9822f61af4..d501a7754bf7b0eb210b0bc84ffb62b61760870a 100755 (executable)
--- a/gettext-tools/tests/msgcat-10
+++ b/gettext-tools/tests/msgcat-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have different comments
 # but the same contents. The resulting header entry is not marked fuzzy,

diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11
index f86b4dfaf8a8c4e888cf7024f4ac41a75968f34b..5c75430d5f282895955baa767e0efb7daf9234b4 100755 (executable)
--- a/gettext-tools/tests/msgcat-11
+++ b/gettext-tools/tests/msgcat-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat leaves #: lines in place even if they have a bizarre
 # syntax.

diff --git a/gettext-tools/tests/msgcat-12 b/gettext-tools/tests/msgcat-12
index cb0c039b13a5c7885f222d81377d661dfdbaa718..a0677c7d9e218b7fceb9034e762fd84c1d2a4ec1 100755 (executable)
--- a/gettext-tools/tests/msgcat-12
+++ b/gettext-tools/tests/msgcat-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat complains when it would need to change msgids.
 

diff --git a/gettext-tools/tests/msgcat-13 b/gettext-tools/tests/msgcat-13
index b7104c0f2f01224c1ec0ff7b2e14def7b7ac0c3b..4a6616ccdf1d998f684949d1770aa5fbc3ca95f8 100755 (executable)
--- a/gettext-tools/tests/msgcat-13
+++ b/gettext-tools/tests/msgcat-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on PO files with contexts.
 

diff --git a/gettext-tools/tests/msgcat-14 b/gettext-tools/tests/msgcat-14
index b6865944cc4ed8231b6c01da20a80c85cddb3652..d3844c766a917a80c342a171ff587619f55b55e0 100755 (executable)
--- a/gettext-tools/tests/msgcat-14
+++ b/gettext-tools/tests/msgcat-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat complains when it would need to change msgctxts.
 

diff --git a/gettext-tools/tests/msgcat-15 b/gettext-tools/tests/msgcat-15
index b89ad8d67921a64781e76785e7b9a444cc837fff..44f164f4f752e66cb1e05f5ad57775fe1a510c5f 100755 (executable)
--- a/gettext-tools/tests/msgcat-15
+++ b/gettext-tools/tests/msgcat-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on a PO file with previous msgids.
 

diff --git a/gettext-tools/tests/msgcat-16 b/gettext-tools/tests/msgcat-16
index 017b249b7787a24f57e02c3ced9ce1c7ae0e7ffa..44dbaab7263c76a3349ce8a3f14997bffa4ed24d 100755 (executable)
--- a/gettext-tools/tests/msgcat-16
+++ b/gettext-tools/tests/msgcat-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on a PO files with previous msgids.
 

diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17
index 593568846286437381cab7310529c0ad4d1311c4..86189a672b07e20e5b55fd79f50ae83b2dc6aa4a 100755 (executable)
--- a/gettext-tools/tests/msgcat-17
+++ b/gettext-tools/tests/msgcat-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat with --width option. Check that format strings are not broken.
 

diff --git a/gettext-tools/tests/msgcat-18 b/gettext-tools/tests/msgcat-18
index 088069bca56b6de19ce731e7407cba98dc44074f..af5a188dcd8cdb74ad8f1d36507124973e0eea69 100755 (executable)
--- a/gettext-tools/tests/msgcat-18
+++ b/gettext-tools/tests/msgcat-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat: handling of 'range:' flags.
 

diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2
index ec48d204b628adff3ee1d4684df9739def8ae86a..b91c25bf4885bf2c4cf407d4aeb9fa0655cdd364 100755 (executable)
--- a/gettext-tools/tests/msgcat-2
+++ b/gettext-tools/tests/msgcat-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 

diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3
index f947d02e3dcd096b29fa5fe309e0f24c316183f3..7247b02b6b25d93fac55e9c8812dfba36175e7c3 100755 (executable)
--- a/gettext-tools/tests/msgcat-3
+++ b/gettext-tools/tests/msgcat-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 # 1. ISO-8859-1, 2. UTF-8; plus --use-first

diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4
index 16da2db8dfb269be35022d817d0de6ed9acecc64..9af00746b2ced665d26dfac2ba9b1e7107ebe088 100755 (executable)
--- a/gettext-tools/tests/msgcat-4
+++ b/gettext-tools/tests/msgcat-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets:
 # 1. UTF-8, 2. ISO-8859-1; plus --use-first

diff --git a/gettext-tools/tests/msgcat-5 b/gettext-tools/tests/msgcat-5
index 745c2f56d6c27aa62d2d28be2b16ac7ea6d9f3cb..6040eee17cc8e3643c232398afb65b8e987b579e 100755 (executable)
--- a/gettext-tools/tests/msgcat-5
+++ b/gettext-tools/tests/msgcat-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different translations:
 # try --use-first

diff --git a/gettext-tools/tests/msgcat-6 b/gettext-tools/tests/msgcat-6
index 16a096ec18d5ea20a3ae89d9ca237f245eb557f6..f5cff7ed364f0f43db291b9bd7193569df225440 100755 (executable)
--- a/gettext-tools/tests/msgcat-6
+++ b/gettext-tools/tests/msgcat-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different translations:
 # preserve all variants, add markers

diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7
index 2d2b4697b5e47e2048d7899bf3ddfb38bc051200..bdca902cddb0dd7728d57b4ae48a748de3d60eb1 100755 (executable)
--- a/gettext-tools/tests/msgcat-7
+++ b/gettext-tools/tests/msgcat-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify 'msgcat --sort-output'
 

diff --git a/gettext-tools/tests/msgcat-8 b/gettext-tools/tests/msgcat-8
index 889440ff2d7c6cdcc1159d30b399a69b0ee37366..f3abdf4ec1decf7ac25ac87758f51fac426624b9 100755 (executable)
--- a/gettext-tools/tests/msgcat-8
+++ b/gettext-tools/tests/msgcat-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have different comments
 # and different contents. The resulting header entry must be marked fuzzy.

diff --git a/gettext-tools/tests/msgcat-9 b/gettext-tools/tests/msgcat-9
index 6eb2c920feb843bf705ead001ee9d07e5fada91b..5178fb18730a759c6870c2a23c694f4ddff6809a 100755 (executable)
--- a/gettext-tools/tests/msgcat-9
+++ b/gettext-tools/tests/msgcat-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have the same comments
 # but different contents. The resulting header entry must be marked fuzzy.

diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1
index 47883068ad05b97850ed4abeb464d651e3f32169..73a16f8272d2c117647a58ff7bcc5e2837863a83 100755 (executable)
--- a/gettext-tools/tests/msgcat-properties-1
+++ b/gettext-tools/tests/msgcat-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --use-first option with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2
index 4570389e55bd4688ff27862bbb8e06c833578404..4b29ff0bb28f80925428f9f0a3fb7b3d660b7574 100755 (executable)
--- a/gettext-tools/tests/msgcat-properties-2
+++ b/gettext-tools/tests/msgcat-properties-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax.
 # Test that encoding names are case insensitive.

diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1
index ff066fe6f68aa3752b8035dbdd353aa3ee3aa779..a227a48b0b5ce8d6098b54ae04beb2efe09d8442 100755 (executable)
--- a/gettext-tools/tests/msgcat-stringtable-1
+++ b/gettext-tools/tests/msgcat-stringtable-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test reading in NeXTstep/GNUstep .strings syntax.
 

diff --git a/gettext-tools/tests/msgcmp-1 b/gettext-tools/tests/msgcmp-1
index dd7813783498d0e416049d47b45efec559537be4..e354dd6755dda6c873dcecb052cedce43542e207 100755 (executable)
--- a/gettext-tools/tests/msgcmp-1
+++ b/gettext-tools/tests/msgcmp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a succeeding comparison.
 

diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2
index bf766e4652494f8d451022bb7c23484fd086ab11..f0443b38c789988014093a488bf6c2383b941815 100755 (executable)
--- a/gettext-tools/tests/msgcmp-2
+++ b/gettext-tools/tests/msgcmp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a failing comparison.
 

diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3
index 5fc7f968b5ab340c2d8e858464c127361502b7ca..ec19ae7e417673555d5b73723dde067ff725f0d6 100755 (executable)
--- a/gettext-tools/tests/msgcmp-3
+++ b/gettext-tools/tests/msgcmp-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a failing comparison with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgcmp-4 b/gettext-tools/tests/msgcmp-4
index f16fe4ab7d517b3e47a54d72fa719a1d548ccae5..ad1e7077a0fc7e0c724cb36968ad7415f3fab69f 100755 (executable)
--- a/gettext-tools/tests/msgcmp-4
+++ b/gettext-tools/tests/msgcmp-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test comparison with PO files with previous msgids.
 # Test --use-fuzzy option.

diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1
index a7e483cdc3ce5e0cfad7252e8bf0058bc427d3c9..8eaabb0494094d113d7398160baafe548c917db7 100755 (executable)
--- a/gettext-tools/tests/msgcomm-1
+++ b/gettext-tools/tests/msgcomm-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0 option.
 

diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10
index 7f6a085bf89cc2f2ec5dfd6bffb314c69675d3bf..443fa86af675f626413bd3cb8855d89bf91cf861 100755 (executable)
--- a/gettext-tools/tests/msgcomm-10
+++ b/gettext-tools/tests/msgcomm-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1 and --omit-header.
 

diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11
index 58af444af5d8f4db26497f5aec8319263189a553..0820872ee5d3f6df966317d39dfa7bf7d7781619 100755 (executable)
--- a/gettext-tools/tests/msgcomm-11
+++ b/gettext-tools/tests/msgcomm-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --more-than=1 drops entries which occur only once.
 

diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12
index 75df966edb09bb440b8256e3b6dbb7244eb48c2d..675d651ac15b8ab53690db58eea75a3257606ed7 100755 (executable)
--- a/gettext-tools/tests/msgcomm-12
+++ b/gettext-tools/tests/msgcomm-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --less-than=2 removes entries which occur twice and keeps entries
 # which occur only once.

diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13
index d8a08dbbd4ac22857eb125524ba3468a00f54c9f..3bf773781adbba2f1fd6b8fb5fe582a8d63400ec 100755 (executable)
--- a/gettext-tools/tests/msgcomm-13
+++ b/gettext-tools/tests/msgcomm-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --less-than=2 removes entries which occur more than twice.
 

diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14
index 253ec32230bcecb86e3ce7292c93c699d48ffa2e..10e688a91a53e9f91873037f979ee8e110cefabe 100755 (executable)
--- a/gettext-tools/tests/msgcomm-14
+++ b/gettext-tools/tests/msgcomm-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --force-po option.
 

diff --git a/gettext-tools/tests/msgcomm-15 b/gettext-tools/tests/msgcomm-15
index 06f558e8e0de689741dd6ef37cafab845bee4620..e85bdd3c55b96c7d44947d1a9bf6c88d2d39e699 100755 (executable)
--- a/gettext-tools/tests/msgcomm-15
+++ b/gettext-tools/tests/msgcomm-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that without --force-po option, a PO file without translations is
 # not created.

diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16
index 13fb95ae51e8ae8ba9edd2f253d9579f342adfe6..7ebe18bd3e6515b95588218c3dee505ba68e923e 100755 (executable)
--- a/gettext-tools/tests/msgcomm-16
+++ b/gettext-tools/tests/msgcomm-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 

diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17
index 92fa3ce92ee9c3afd55a68de9c548f9aa6218f76..67dfe0de0d324c661f3a8839aca762a120ff9fd1 100755 (executable)
--- a/gettext-tools/tests/msgcomm-17
+++ b/gettext-tools/tests/msgcomm-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # -u, --unique (equivalent to --less-than=2): we are interested in unique
 # entries only (entries occurring less than 2 times).  But don't drop the

diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18
index ff8c23e36368b65a66fd386d38c0869ad41d34bb..0c929ed3dfacff7b51a3654dfed762ac53f690d2 100755 (executable)
--- a/gettext-tools/tests/msgcomm-18
+++ b/gettext-tools/tests/msgcomm-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 

diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19
index 596c24be2c3a6da9f90ddbe94acb2f0234c333ac..d7b4ad90e5adad1a5579ffbb86885ec285d1a58b 100755 (executable)
--- a/gettext-tools/tests/msgcomm-19
+++ b/gettext-tools/tests/msgcomm-19
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If the first occurrence is fuzzy, keep the fuzzy mark.

diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2
index 8c3c26662233d267aae6759637d39cdffe23e944..be2b073a6de80bd86f13ed3069a00aad290a18d3 100755 (executable)
--- a/gettext-tools/tests/msgcomm-2
+++ b/gettext-tools/tests/msgcomm-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location option.
 

diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20
index 30a8c27fcbfc38d3923a00c2a3c0ea3185bef0df..e78ead1c51725b34a79b27288eecf42dddfa0e6b 100755 (executable)
--- a/gettext-tools/tests/msgcomm-20
+++ b/gettext-tools/tests/msgcomm-20
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If the first occurrence is not fuzzy, don't make the result fuzzy.

diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21
index 2be54e357ae0b2c36b74a45166bd26bc2e0c5be9..a3ed94637974435dd7e9ae6e64aadd62cf8ca511 100755 (executable)
--- a/gettext-tools/tests/msgcomm-21
+++ b/gettext-tools/tests/msgcomm-21
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If both occurrences are fuzzy, keep the fuzzy mark.

diff --git a/gettext-tools/tests/msgcomm-22 b/gettext-tools/tests/msgcomm-22
index 42b28d30fb782309de8593d60158387230516ea1..7b4906218dc193268ab4e5b9eb36ee1bb1a491ab 100755 (executable)
--- a/gettext-tools/tests/msgcomm-22
+++ b/gettext-tools/tests/msgcomm-22
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that the header entry is kept, otherwise the encoding is unknown.
 

diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23
index c7aefa3c72a9dd295a3646eef9c292c960accdac..b369464eae1aa755767e6f5c8c3c998fb9ffd4b6 100755 (executable)
--- a/gettext-tools/tests/msgcomm-23
+++ b/gettext-tools/tests/msgcomm-23
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # "msgcomm INPUT INPUT" is equivalent to "msguniq INPUT"
 
@@ -6,8 +7,8 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mcomm-23.in1 mcomm-23.in2"
-cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in1
-cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
+cp ../${srcdir}/msguniq-a.in mcomm-23.in1
+cp ../${srcdir}/msguniq-a.in mcomm-23.in2
 
 tmpfiles="$tmpfiles mcomm-23.tmp mcomm-23.out"
 : ${MSGCOMM=msgcomm}
@@ -17,7 +18,7 @@ LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/msguniq-a.out mcomm-23.out
+${DIFF} ../${srcdir}/msguniq-a.out mcomm-23.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24
index dd40dfb74348cc0dd828fc72c47749af7815a00e..6eddf8dee648ff37bef2ad97e1f81ebaadd01611 100755 (executable)
--- a/gettext-tools/tests/msgcomm-24
+++ b/gettext-tools/tests/msgcomm-24
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0 option with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgcomm-25 b/gettext-tools/tests/msgcomm-25
index 8ec3fe8803d4003e08c3713d7187c57b96d7b193..8196dd36d710ed1a87f039706b22a2e7a00a9faf 100755 (executable)
--- a/gettext-tools/tests/msgcomm-25
+++ b/gettext-tools/tests/msgcomm-25
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcomm on PO files with contexts.
 

diff --git a/gettext-tools/tests/msgcomm-26 b/gettext-tools/tests/msgcomm-26
index 0e79f8a597187e1211b27b8a3a685bb0d29c0796..ef9df7bf5bc47fa3ef9903e064e9bd7a6fe384d5 100755 (executable)
--- a/gettext-tools/tests/msgcomm-26
+++ b/gettext-tools/tests/msgcomm-26
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcomm on PO files with previous msgids.
 

diff --git a/gettext-tools/tests/msgcomm-27 b/gettext-tools/tests/msgcomm-27
index 09d423d751fa190ed36c2160d033f85b34836056..7115e3d11b7d4830c36fc0830cbc47bf15d46993 100755 (executable)
--- a/gettext-tools/tests/msgcomm-27
+++ b/gettext-tools/tests/msgcomm-27
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of format and 'range:' flag.
 

diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3
index 66539ccfbba345bb7a9042469565975938ef6471..5d82f7a39e8987eb9603e8059e7e36cdc0a860a4 100755 (executable)
--- a/gettext-tools/tests/msgcomm-3
+++ b/gettext-tools/tests/msgcomm-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --omit-header option when there is no header.
 

diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4
index e3579aff5d2f19323c8e13a77a24a5eae3a4ac95..a419fa752b883bfe48296f03e467fd4788cf0ca7 100755 (executable)
--- a/gettext-tools/tests/msgcomm-4
+++ b/gettext-tools/tests/msgcomm-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test what happens with the header entry.
 

diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5
index 8442a5d517f2dbadb02bf15fe2642153da4da96c..b3159e9300c89c409381e082a5927114049302c7 100755 (executable)
--- a/gettext-tools/tests/msgcomm-5
+++ b/gettext-tools/tests/msgcomm-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --omit-header option when there is a header.
 

diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6
index 6dca10b4321a8f1079723f16670564e6627a7d95..1abfa4ffacd16119e1ca2223c9afe5db77a78ab6 100755 (executable)
--- a/gettext-tools/tests/msgcomm-6
+++ b/gettext-tools/tests/msgcomm-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location option when there is a header.
 

diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7
index 529cf735c80fd69ee2346af5b683e15fe06a55c3..776b4b709af9ed3cf9248ef90146086bd8688235 100755 (executable)
--- a/gettext-tools/tests/msgcomm-7
+++ b/gettext-tools/tests/msgcomm-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location and --omit-header options together.
 

diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8
index 76170fc727fe97f24ce075f4ff5a7faf59e65bed..0c582890647085975522a76d327dce2f70169e34 100755 (executable)
--- a/gettext-tools/tests/msgcomm-8
+++ b/gettext-tools/tests/msgcomm-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1.
 

diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9
index fac28513bc4fda935ecc309692771cc73b76d4df..b6da6db85db1fae176c46b3ef999b64a4944da5d 100755 (executable)
--- a/gettext-tools/tests/msgcomm-9
+++ b/gettext-tools/tests/msgcomm-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1 and --no-location.
 

diff --git a/gettext-tools/tests/msgconv-1 b/gettext-tools/tests/msgconv-1
index 576f9d633ce97faa816cbc60775f9514762eb4f9..b38864f502f760b61339636fd53b79e1e1251378 100755 (executable)
--- a/gettext-tools/tests/msgconv-1
+++ b/gettext-tools/tests/msgconv-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from BIG5 to UTF-8.
 

diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
index 850a0431a66ac906d4daff3c49620cb381d01022..e3f523297bee8c0feba71043c3cca9e6bb2a631b 100755 (executable)
--- a/gettext-tools/tests/msgconv-2
+++ b/gettext-tools/tests/msgconv-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5.
 # Test that encoding names are case insensitive.

diff --git a/gettext-tools/tests/msgconv-3 b/gettext-tools/tests/msgconv-3
index 97582f111efae5109ff220095bd0ae0668c6d091..8b8c2e26953ca2ab4007d551a512da40431cbdf3 100755 (executable)
--- a/gettext-tools/tests/msgconv-3
+++ b/gettext-tools/tests/msgconv-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test failing conversion from ISO-8859-15 to ISO-8859-1.
 

diff --git a/gettext-tools/tests/msgconv-4 b/gettext-tools/tests/msgconv-4
index b41c89fd344a123487ee5c7bbeca2fe7332fbf53..469a3b88396f0433b36d2a8d17445cc6d4a815a0 100755 (executable)
--- a/gettext-tools/tests/msgconv-4
+++ b/gettext-tools/tests/msgconv-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax.
 # Test that encoding names are case insensitive.

diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5
index 3850c43edf35d800dd137d340dc2301964f51a36..dcf52bd11da08fc7c6938bddc48da439b67f9424 100755 (executable)
--- a/gettext-tools/tests/msgconv-5
+++ b/gettext-tools/tests/msgconv-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgconv on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msgconv-6 b/gettext-tools/tests/msgconv-6
index e6adc6525bed11dc6672bd979ed36e840f9ef908..8f01c9140cd265a95c4e24e20f8f170143540fcf 100755 (executable)
--- a/gettext-tools/tests/msgconv-6
+++ b/gettext-tools/tests/msgconv-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgconv on a PO file with previous msgids.
 

diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1
index fc3983cf2bfdd91a48f67ece761f780aa7212021..cb52c68f5547825ce51cbdacf79a7c3babbd3680 100755 (executable)
--- a/gettext-tools/tests/msgen-1
+++ b/gettext-tools/tests/msgen-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation.
 

diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2
index 12525d2e1eb242c828f39658d5e58687dd3ae68b..60575150b28f4cabdfca02f9c1ad7be8d2b7316e 100755 (executable)
--- a/gettext-tools/tests/msgen-2
+++ b/gettext-tools/tests/msgen-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgen-3 b/gettext-tools/tests/msgen-3
index 9ff5fdb8ed35a8848fe215809061f19eb1c4c19c..318b330fc520521dc4f3196321d6cf3dcc249ecc 100755 (executable)
--- a/gettext-tools/tests/msgen-3
+++ b/gettext-tools/tests/msgen-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgen on a POT file with contexts.
 

diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1
index 855af8863a60e7767eb21bd1d10e5f53cadfbaec..3809d83509bbb51f4b3c106fa0972c8ec3c7ee21 100755 (executable)
--- a/gettext-tools/tests/msgexec-1
+++ b/gettext-tools/tests/msgexec-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of an external command.
 

diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2
index 94d61e9dbf4b23a83ee472dce5cc56e9faf2f603..56371e0bf56833119bd37821f03946cfb642ec04 100755 (executable)
--- a/gettext-tools/tests/msgexec-2
+++ b/gettext-tools/tests/msgexec-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the builtin command "0".
 
@@ -80,7 +81,7 @@ LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
+${CMP} ../${srcdir}/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msgexec-3 b/gettext-tools/tests/msgexec-3
index 7cc3bb5d5f40ee96b1c6c20f497195f51761ad4e..771f0677605c5b62b2a389863a7506d847374254 100755 (executable)
--- a/gettext-tools/tests/msgexec-3
+++ b/gettext-tools/tests/msgexec-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of an external command with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgexec-4 b/gettext-tools/tests/msgexec-4
index 9683b406792b7c620b8b3f2cd5b114bb4e6f55e9..4f67a7b1452c78b6e65d4394d895f75f0001a59c 100755 (executable)
--- a/gettext-tools/tests/msgexec-4
+++ b/gettext-tools/tests/msgexec-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgexec on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index 6241e44180e688bd5de15e0cd897842b88202263..5db883028e83a13db8a3e251b7d0cf14517a9d4b 100755 (executable)
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general filter execution.
 

diff --git a/gettext-tools/tests/msgfilter-2 b/gettext-tools/tests/msgfilter-2
index 20887cd958742c776ef973b4304eff5b712bcd7f..c0e436f822f191c768d8eec70d5e2039d1073fac 100755 (executable)
--- a/gettext-tools/tests/msgfilter-2
+++ b/gettext-tools/tests/msgfilter-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test sed execution.
 

diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3
index e36df42c5df2253cfac19dd3e252d5c66a9854a5..8ee5fc61828aafdc0ed4d60f01c8b893b03c30e3 100755 (executable)
--- a/gettext-tools/tests/msgfilter-3
+++ b/gettext-tools/tests/msgfilter-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general filter execution with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgfilter-4 b/gettext-tools/tests/msgfilter-4
index d8cab872b063b129f1b1bfb5614127653d7b7515..7017145d87bc0983c273922400fae0dd575e41bd 100755 (executable)
--- a/gettext-tools/tests/msgfilter-4
+++ b/gettext-tools/tests/msgfilter-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfilter on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1
index a8c0eac43a10fa27f08d3d633d29fba5260c6b67..69af7d33c87a25bd48e66d2f498a0477e984b5d3 100755 (executable)
--- a/gettext-tools/tests/msgfilter-sr-latin-1
+++ b/gettext-tools/tests/msgfilter-sr-latin-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfilter with command recode-sr-latin1.
 # Verify that it converts to UTF-8.

diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1
index b44dded06ff0656100370a6fbc681e85e82c66c3..0e7315b2eb427dd001ab9fd0e7856653281d5f72 100755 (executable)
--- a/gettext-tools/tests/msgfmt-1
+++ b/gettext-tools/tests/msgfmt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functionality, duplicate detection, multiple domains.
 

diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index 00229588cec5589dec84b5ab16de457e676544d9..70f0f6b9befbed0dc0a131d7621243cd535561c2 100755 (executable)
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test format string checking in plural entries.
 

diff --git a/gettext-tools/tests/msgfmt-11 b/gettext-tools/tests/msgfmt-11
index 0d8f1ffed7326da9ba25670672f891b542970e85..002d696afb232f2aa0cd4af0e8f8fe2beaf9f819 100755 (executable)
--- a/gettext-tools/tests/msgfmt-11
+++ b/gettext-tools/tests/msgfmt-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of invalid multibyte sequences.
 

diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12
index 1c2f6fa3382a17a5433df40cbde894098768316d..24743eb2cc6ec0b54ea462edad590eb392ffcf1b 100755 (executable)
--- a/gettext-tools/tests/msgfmt-12
+++ b/gettext-tools/tests/msgfmt-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 

diff --git a/gettext-tools/tests/msgfmt-13 b/gettext-tools/tests/msgfmt-13
index 6822c8abc6edc1d8a15666042050e1450b0e72d9..d9cb0179bf660d7c2d561fe25c75c1a9b1e256ca 100755 (executable)
--- a/gettext-tools/tests/msgfmt-13
+++ b/gettext-tools/tests/msgfmt-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that an out-of-range Unicode character doesn't lead to a crash.
 

diff --git a/gettext-tools/tests/msgfmt-14 b/gettext-tools/tests/msgfmt-14
index 7b7d3d2d1ec9f1a4964cb8f8971d61b81924c585..da984625159b1ceb3ca1dc05b4b0660bc28f30bc 100755 (executable)
--- a/gettext-tools/tests/msgfmt-14
+++ b/gettext-tools/tests/msgfmt-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt and msgunfmt on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msgfmt-15 b/gettext-tools/tests/msgfmt-15
index b2712c61f2ef8c5163cf554045f780abf597a169..731b16a91cc8a8984005d84ab5c5858cdc4e12fd 100755 (executable)
--- a/gettext-tools/tests/msgfmt-15
+++ b/gettext-tools/tests/msgfmt-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test plural formula dependent checking of format strings.
 

diff --git a/gettext-tools/tests/msgfmt-16 b/gettext-tools/tests/msgfmt-16
index 44043510829d7ce195a5e2840f548c9c9fe267a8..deccad5ab818a420ec0d407f89e08909ce89f032 100755 (executable)
--- a/gettext-tools/tests/msgfmt-16
+++ b/gettext-tools/tests/msgfmt-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt on a PO file with previous msgids.
 

diff --git a/gettext-tools/tests/msgfmt-17 b/gettext-tools/tests/msgfmt-17
index b077030ad01ead6af7b1b517f3f03aea33ea44c4..44a730e5f8fa3fee38f5a6bb62155bf61fc27129 100755 (executable)
--- a/gettext-tools/tests/msgfmt-17
+++ b/gettext-tools/tests/msgfmt-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test range dependent checking of format strings with plural forms.
 

diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2
index 743ab0817e727fe847a3b3a3a7e742f44872d6ca..fdaf965f362137451dd26943a8ad5b95f33d9c32 100755 (executable)
--- a/gettext-tools/tests/msgfmt-2
+++ b/gettext-tools/tests/msgfmt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functionality, duplicate detection, multiple domains.
 

diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3
index 49625e35c8b4b026cbf172570665ac8a7d4d11f9..fe40ee8fae29a51a8b5d6bc00de8e8f25fade339 100755 (executable)
--- a/gettext-tools/tests/msgfmt-3
+++ b/gettext-tools/tests/msgfmt-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that an empty header entry is OK.
 

diff --git a/gettext-tools/tests/msgfmt-4 b/gettext-tools/tests/msgfmt-4
index 43de254c175f3ed1abd8888ec31515e0ef6f2ce9..3868c20c3054c249a64c0353d4d321b4119dd8f4 100755 (executable)
--- a/gettext-tools/tests/msgfmt-4
+++ b/gettext-tools/tests/msgfmt-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test c-format handling.
 

diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5
index 0eee91a88f1796675f4d77a27bb58a087ef846e3..46c101b8934bc46825246fe508e6cd81ba92b8e4 100755 (executable)
--- a/gettext-tools/tests/msgfmt-5
+++ b/gettext-tools/tests/msgfmt-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 

diff --git a/gettext-tools/tests/msgfmt-6 b/gettext-tools/tests/msgfmt-6
index 5c7910769284ca65dc7db0a4665e0a410dc60c4e..f2a083704b7555150f7a46aba58ff7f9204cee19 100755 (executable)
--- a/gettext-tools/tests/msgfmt-6
+++ b/gettext-tools/tests/msgfmt-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test catching of division by zero in plural expression.
 

diff --git a/gettext-tools/tests/msgfmt-7 b/gettext-tools/tests/msgfmt-7
index 0c7d96add069da28ff50391a9ae7ee4b16ecf087..bdcf97f4dab369e7d917eafa26f5891adbdcf9e9 100755 (executable)
--- a/gettext-tools/tests/msgfmt-7
+++ b/gettext-tools/tests/msgfmt-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Check for duplicates with identical translations
 

diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8
index cc7c0623e1d9aa21aed151d9a95716a0551ad9a2..fd81344b381c841ff506ea7f550fa528a551dc86 100755 (executable)
--- a/gettext-tools/tests/msgfmt-8
+++ b/gettext-tools/tests/msgfmt-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Check for duplicates with different translations
 

diff --git a/gettext-tools/tests/msgfmt-9 b/gettext-tools/tests/msgfmt-9
index 4e77327f3fa2162cc78dbbc22bd0f59f74d921ae..4704341249ca09cd52043c0bbed1a2f49e182680 100755 (executable)
--- a/gettext-tools/tests/msgfmt-9
+++ b/gettext-tools/tests/msgfmt-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Duplicates are also fatal in obsolete marked entries.
 

diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1
index fad593b7458c495d910f6517200649e55309f3c0..de9320a12c524a5e1186958df75209d16e032add 100755 (executable)
--- a/gettext-tools/tests/msgfmt-properties-1
+++ b/gettext-tools/tests/msgfmt-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functioning with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index 26b90a155e2e939ef2ca5e5d1e24550b4613e5b8..e506c2a1df1c2bf9b27c28b8595ec731750f1535 100755 (executable)
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test output in Qt .qm format.
 
@@ -7,11 +8,11 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mf-qt-1.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt -o mf-qt-1.qm ${top_srcdir}/tests/qttest_pl.po
+${MSGFMT} --qt -o mf-qt-1.qm ../${srcdir}/qttest_pl.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
+${CMP} ../${srcdir}/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2
index 1c6518b96eb2e520eb250e2c20fac0d5d61e2cd0..7820f6313c302efc8a6eb8d67af8bf6d64bfb1cb 100755 (executable)
--- a/gettext-tools/tests/msgfmt-qt-2
+++ b/gettext-tools/tests/msgfmt-qt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt --qt on a PO file with contexts.
 
@@ -7,11 +8,11 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mf-qt-2.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt ${top_srcdir}/tests/qttest2_de.po -o mf-qt-2.qm
+${MSGFMT} --qt ../${srcdir}/qttest2_de.po -o mf-qt-2.qm
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
+${CMP} ../${srcdir}/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1
index 25b291a40d206b8747ac6e926e6a9b1cad398199..da2052900ed25e607a54ad997f9571d02c94bd92 100755 (executable)
--- a/gettext-tools/tests/msggrep-1
+++ b/gettext-tools/tests/msggrep-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --location option.
 

diff --git a/gettext-tools/tests/msggrep-10 b/gettext-tools/tests/msggrep-10
index 9ca91c2ee37dcc653aa3a6f0ccf7f7c9f54d08a5..140ea6d53be8731afa741b97bda899f43caa02ed 100755 (executable)
--- a/gettext-tools/tests/msggrep-10
+++ b/gettext-tools/tests/msggrep-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that $ as end-of-line anchor does not cause a crash.
 # <https://bugzilla.redhat.com/show_bug.cgi?id=483181>

diff --git a/gettext-tools/tests/msggrep-2 b/gettext-tools/tests/msggrep-2
index 51ef1815bef17e90eeaa0e4182d8fe4b3b38706e..c7047a5b16f8a63ca32f4f47a72918964e5440f4 100755 (executable)
--- a/gettext-tools/tests/msggrep-2
+++ b/gettext-tools/tests/msggrep-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --domain option.
 

diff --git a/gettext-tools/tests/msggrep-3 b/gettext-tools/tests/msggrep-3
index 83f2e615e1d17972896b59b23381da5ef53379f1..5cd44b3a757f7fd64a85b2b48d7c12b0cb029485 100755 (executable)
--- a/gettext-tools/tests/msggrep-3
+++ b/gettext-tools/tests/msggrep-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --msgid and --msgstr options.
 

diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4
index 8e92d5f25f3dddfce6ca6050cccf931e5537743a..4677b0a18af34dd6ea71aefdb9a04fa25e09a142 100755 (executable)
--- a/gettext-tools/tests/msggrep-4
+++ b/gettext-tools/tests/msggrep-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multiple -e and multiple -f options.
 

diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5
index e2583e110fc2bcf7bf8abb6d0e78eb996d12ba7c..449490565c73efdb6b3f0138d53bf544e5ed28f3 100755 (executable)
--- a/gettext-tools/tests/msggrep-5
+++ b/gettext-tools/tests/msggrep-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --comment option.
 

diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6
index c57b52ab1d586856d4e5c124fc8862ca69c477eb..79b5a034b9916a31a8e5e0629246f97efefc9d4f 100755 (executable)
--- a/gettext-tools/tests/msggrep-6
+++ b/gettext-tools/tests/msggrep-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --msgid and --msgstr options with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7
index caa2e2e977d2298df99f7e60ed8727aa15108b49..287187cbfdb11ba0cfc1e8109a63f0814171fad6 100755 (executable)
--- a/gettext-tools/tests/msggrep-7
+++ b/gettext-tools/tests/msggrep-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msggrep on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msggrep-8 b/gettext-tools/tests/msggrep-8
index adc6cd3f7bb2adab23ed54a24d00562064a4cc38..42fef136c036adda0d2ae7fb4b60dc3a5aab018f 100755 (executable)
--- a/gettext-tools/tests/msggrep-8
+++ b/gettext-tools/tests/msggrep-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --extracted-comment option.
 

diff --git a/gettext-tools/tests/msggrep-9 b/gettext-tools/tests/msggrep-9
index 8ededc237499e640402f9499ec9bbd2dba846061..6a0750ce88576cde89465cec7fa0567db1ff8471 100755 (executable)
--- a/gettext-tools/tests/msggrep-9
+++ b/gettext-tools/tests/msggrep-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test interpretation of $ as end-of-line anchor.
 

diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1
index 9cf69282b391038f32ef349377a0c63541c8b6da..820a35a4f5c1ec5012ff3f182b928f2b419cf970 100755 (executable)
--- a/gettext-tools/tests/msginit-1
+++ b/gettext-tools/tests/msginit-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test plural count for locales with nplurals != 2.
 

diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2
index 63edb6c8ad0bdd5e976241e0407b2a99fe69828d..cbe681d9e8b1717ea436ba0f9ed776cedabdfa5e 100755 (executable)
--- a/gettext-tools/tests/msginit-2
+++ b/gettext-tools/tests/msginit-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msginit on a POT file with contexts.
 

diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1
index b122928fc1435f48664e95bf08238fb625fb9970..386f64e124774f465e0270ba8cfd418f9c0bd097 100755 (executable)
--- a/gettext-tools/tests/msgmerge-1
+++ b/gettext-tools/tests/msgmerge-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation and line wrapping.
 

diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10
index e8ef11f8104d550b7c271d4c834b7903a7e852e1..c108bb1402c87e335b4f495e9be5cf94a496e26e 100755 (executable)
--- a/gettext-tools/tests/msgmerge-10
+++ b/gettext-tools/tests/msgmerge-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in ref.pot but not
 # in def.po.

diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
index 8902f443d9b8f7373d0c82d2f8f54d760084dc24..a0203f575e80c18e4c2eb5215082039e62506362 100755 (executable)
--- a/gettext-tools/tests/msgmerge-11
+++ b/gettext-tools/tests/msgmerge-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in ref.pot but not
 # in def.po.

diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12
index 158a118c17fc0f8d6d13a089b830e8a551016719..d6d629a992b855a0e7d4577ec6e3725f1a9f44e4 100755 (executable)
--- a/gettext-tools/tests/msgmerge-12
+++ b/gettext-tools/tests/msgmerge-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in def.po but not
 # in ref.pot.

diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13
index dea83f2697660cd10e1e73cbb532abe27ae3fd54..35218670034f7cafb339e90eb3dfe4edfbda745a 100755 (executable)
--- a/gettext-tools/tests/msgmerge-13
+++ b/gettext-tools/tests/msgmerge-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has c-format specified in ref.pot but not
 # in def.po.

diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14
index 2087a667b8c2860dc88f35707283f8889901625f..ae94811eb68fd0d116ce46b80046f15b5507bcff 100755 (executable)
--- a/gettext-tools/tests/msgmerge-14
+++ b/gettext-tools/tests/msgmerge-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a ref.pot in UTF-8 encoding against a def.po in legacy
 # encoding (that was produced from an older version of ref.pot, in ASCII

diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15
index a743e1c880868c1b836f5b21f2e2b119dccb32ab..84d50f83e9e636571dd22ad3156b6d279fc31a7e 100755 (executable)
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test pseudo-comments containing filenames that start with a digit.
 

diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16
index e5e590099daa1ba19d87a11a1aee5a12f0724501..f23eb1f2b0880015a4f99b483f9314d583edb4e4 100755 (executable)
--- a/gettext-tools/tests/msgmerge-16
+++ b/gettext-tools/tests/msgmerge-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test non-ASCII msgids when the PO file and the POT file are in different
 # encodings.

diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-17
index bc1bc6df55ce3f902dae0d4b9f4bee76c5161007..c730cc917b33155d688a3c26aac69ff76bf9c271 100755 (executable)
--- a/gettext-tools/tests/msgmerge-17
+++ b/gettext-tools/tests/msgmerge-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that untranslated messages that are brought over from the .pot file
 # get the right number of msgstrs.

diff --git a/gettext-tools/tests/msgmerge-18 b/gettext-tools/tests/msgmerge-18
index f5d381349f969989d1cc19021d0fd1863f8f4e44..f7b3bfc2b9a4772462e157aaa41f7019b33b6f32 100755 (executable)
--- a/gettext-tools/tests/msgmerge-18
+++ b/gettext-tools/tests/msgmerge-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge and msgcmp on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msgmerge-19 b/gettext-tools/tests/msgmerge-19
index e3e3c27803e0c5de7597d26bcf399a0d64f1fee8..2a08ddf65ecd55ed209b8d5c3059020e56367440 100755 (executable)
--- a/gettext-tools/tests/msgmerge-19
+++ b/gettext-tools/tests/msgmerge-19
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge --previous option.
 

diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2
index 7f857bfa92371b8b8fbbef99bcc46fd17673ef86..f3564e3b1e9d1b254b1cfeaf05a6387a806b5f3d 100755 (executable)
--- a/gettext-tools/tests/msgmerge-2
+++ b/gettext-tools/tests/msgmerge-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of duplicates.
 

diff --git a/gettext-tools/tests/msgmerge-20 b/gettext-tools/tests/msgmerge-20
index 09ce9cf224e0367b0f3409a4e374da4d70e87c7d..0b53b6f25e11825b21656a168b829ffe1757f008 100755 (executable)
--- a/gettext-tools/tests/msgmerge-20
+++ b/gettext-tools/tests/msgmerge-20
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when the second argument is a PO file with obsolete messages
 # (e.g. the result of an earlier msgmerge operation).

diff --git a/gettext-tools/tests/msgmerge-21 b/gettext-tools/tests/msgmerge-21
index ca3544ddfafb8a4467d39863658b85f4fca05b34..bc492766b7d942ac3c0a3acc1a6e291ab2d6c95c 100755 (executable)
--- a/gettext-tools/tests/msgmerge-21
+++ b/gettext-tools/tests/msgmerge-21
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a message's flags have been changed from c-format to
 # kde-format. Reported by Chusslove Illich (Часлав Илић).

diff --git a/gettext-tools/tests/msgmerge-22 b/gettext-tools/tests/msgmerge-22
index 4b60cf8b3e8f968e5c2152d237ab02ad432c3549..d8c975db495786c1eb6c857a13e2a256d6bad090 100755 (executable)
--- a/gettext-tools/tests/msgmerge-22
+++ b/gettext-tools/tests/msgmerge-22
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a msgid_plural changed but msgid remained the same.
 # Reported by Chusslove Illich (Часлав Илић).

diff --git a/gettext-tools/tests/msgmerge-23 b/gettext-tools/tests/msgmerge-23
index 073270dd0ad9e7fc7ea4a2345a7211a5d2329e42..b6d292785b61f9e1969e6d59dd562f3a11a96ddf 100755 (executable)
--- a/gettext-tools/tests/msgmerge-23
+++ b/gettext-tools/tests/msgmerge-23
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a msgid_plural changed but msgid remained the same,
 # and --previous was specified.

diff --git a/gettext-tools/tests/msgmerge-24 b/gettext-tools/tests/msgmerge-24
index 95647815fd87a212a080dd4b743a2da97cd90e09..4e1c0a52245ae47283f0aec6bf922c168818e71d 100755 (executable)
--- a/gettext-tools/tests/msgmerge-24
+++ b/gettext-tools/tests/msgmerge-24
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge and msgcmp: handling of 'range:' flags.
 

diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3
index 0f8fd2d2f2fcd554c004777b4a219510f8038383..92a04beb425997d928159fa5e59737c7512f9846 100755 (executable)
--- a/gettext-tools/tests/msgmerge-3
+++ b/gettext-tools/tests/msgmerge-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of obsolete/untranslated messages.
 

diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4
index 904a4c616bbf774863f5828133d2681c0844ceb8..6329d70830ec9821c7e25678fa4c3e02df6c0e5b 100755 (executable)
--- a/gettext-tools/tests/msgmerge-4
+++ b/gettext-tools/tests/msgmerge-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of comments.
 

diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5
index 69886f137a7741ae39f759b0be319fe5f6e6d2fb..3c53aabc35ca990f223d4e54a564b8e6ca60d71b 100755 (executable)
--- a/gettext-tools/tests/msgmerge-5
+++ b/gettext-tools/tests/msgmerge-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of header entry.
 

diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6
index e8ffc71f054cce676aaa369b9c9b4ad10c921279..93dabcd8fe4707d90f23b2487fe6602ba61b6195 100755 (executable)
--- a/gettext-tools/tests/msgmerge-6
+++ b/gettext-tools/tests/msgmerge-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test non-ASCII character at the end of msgstr. (Triggered a glibc-2.1 bug.)
 

diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7
index a64111b7111e44033cb544b69ac83a4d0073a0dd..bb4fc5bbba1f26642ed5fa5edbad9d819648d883 100755 (executable)
--- a/gettext-tools/tests/msgmerge-7
+++ b/gettext-tools/tests/msgmerge-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 

diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8
index 9381977441a6496655336afbd15c63996c027562..2bae7dbcd6607a9d1e8fa1d1487aad48ffb13829 100755 (executable)
--- a/gettext-tools/tests/msgmerge-8
+++ b/gettext-tools/tests/msgmerge-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 

diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9
index 8379b5e1e71d1e73c7b2ae424a3d9dce1788b6c3..2477ec1c41d2f480343df82aa72b6827bd6fe881 100755 (executable)
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Duplicates are also fatal in obsolete marked entries (cf. msgmerge-3).
 

diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index c8f3dbba143f4dec392ae90b3676f753781f0139..8b949eb918c337dfd35256a24074a28ff7aa4c9c 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.
 

diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2
index 3613d0adb399f5024205cacc22334be585fd26b6..61cad2204b0d000538c2ddb6085a442ae5d9bf37 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-2
+++ b/gettext-tools/tests/msgmerge-compendium-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with fuzziness.
 

diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3
index 743633c990884defa779f4acaeec0c6fe8108dfb..dc89ea57f16534c82ade3356e19f37ae8a14d3a5 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-3
+++ b/gettext-tools/tests/msgmerge-compendium-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.
 

diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4
index 42b85461a2c96393e61944d6de6bc85dc6d92ce2..d119a5232823db89f4eca1b25f36dc48e78765d8 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-4
+++ b/gettext-tools/tests/msgmerge-compendium-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.  Use it there was no "old" PO file at all
 # (merely use /dev/null).

diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5
index 4e7327a280959daaeb302c97b34bf7c14739b97c..d39b1abc9b4a97ff83b09c8d875ecefda5f7d938 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-5
+++ b/gettext-tools/tests/msgmerge-compendium-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with a large compendium.
 
@@ -8,14 +9,14 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles mm-c-5.tmp mm-c-5.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-5.tmp \
-  --compendium ${top_srcdir}/tests/mm-viet.comp.po \
-  /dev/null ${top_srcdir}/tests/mm-viet.pot
+  --compendium ../${srcdir}/mm-viet.comp.po \
+  /dev/null ../${srcdir}/mm-viet.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/mm-viet.out mm-c-5.out
+${DIFF} ../${srcdir}/mm-viet.out mm-c-5.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
index 89f38333a227c0e53d426d868b21227f66c1dbaa..eb2d64fbc7a83ab53dcd7c4934fe865d1c7c08dc 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-6
+++ b/gettext-tools/tests/msgmerge-compendium-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with mixed encodings.
 # 8 combinations total:
@@ -11,21 +12,21 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mm-ko.utf-8.pot"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot ${top_srcdir}/tests/mm-ko.ascii.pot
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot ../${srcdir}/mm-ko.ascii.pot
 
 tmpfiles="$tmpfiles mm-ko.utf-8.po"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po ../${srcdir}/mm-ko.euc-kr.po
 
 tmpfiles="$tmpfiles mm-ko-comp.utf-8.po"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ${top_srcdir}/tests/mm-ko-comp.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ../${srcdir}/mm-ko-comp.euc-kr.po
 
 tmpfiles="$tmpfiles mm-c-6-AEE.tmp mm-c-6-AEE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
+  ../${srcdir}/mm-ko.euc-kr.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -34,7 +35,7 @@ tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  ../${srcdir}/mm-ko.euc-kr.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -42,8 +43,8 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
+  mm-ko.utf-8.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -52,7 +53,7 @@ tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  mm-ko.utf-8.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -60,8 +61,8 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
+  ../${srcdir}/mm-ko.euc-kr.po mm-ko.utf-8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -70,7 +71,7 @@ tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
+  ../${srcdir}/mm-ko.euc-kr.po mm-ko.utf-8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -78,7 +79,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
   mm-ko.utf-8.po mm-ko.utf-8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out

diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1
index eb329c28a7daaf223fcf5da81d87d947cd1832d2..bf58c20c28bc65e1d27efea08a847fa99dcc6f79 100755 (executable)
--- a/gettext-tools/tests/msgmerge-properties-1
+++ b/gettext-tools/tests/msgmerge-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of obsolete/untranslated messages with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2
index 37d2db60fe86e558add03cf9fe22489d245fe1c4..fee33e7668b8c4ab53a9ea6093115467ae69ed09 100755 (executable)
--- a/gettext-tools/tests/msgmerge-properties-2
+++ b/gettext-tools/tests/msgmerge-properties-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: location changed, and xgettext comment added. Both changes
 # must be reflected in the resulting PO file. With Java .properties syntax.

diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1
index 8b167218f815d90762e71f09b78bbcd1816c4bcd..c1dccadb5f09e42d1faa41f7b60f9f561d3455af 100755 (executable)
--- a/gettext-tools/tests/msgmerge-update-1
+++ b/gettext-tools/tests/msgmerge-update-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: nothing changed; don't normalize second message
 

diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2
index 6f4d4a0bc894bedde75372a6671d57e6e2e82c59..765c052d6450fe503a84ac3181fc3ee266b43258 100755 (executable)
--- a/gettext-tools/tests/msgmerge-update-2
+++ b/gettext-tools/tests/msgmerge-update-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: location changed, and xgettext comment added. Both changes
 # must be reflected in the resulting PO file.

diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3
index 375f19bafc258d9b1d0ccb3719dcbf499992e259..ddc9f3ac9802416ded6ff2f343deabefdc168446 100755 (executable)
--- a/gettext-tools/tests/msgmerge-update-3
+++ b/gettext-tools/tests/msgmerge-update-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: POT-Creation-Date changed. This change must not be reflected
 # in the resulting PO file; this is needed for projects which don't put the

diff --git a/gettext-tools/tests/msgmerge-update-4 b/gettext-tools/tests/msgmerge-update-4
index dfbe0be35eb6d39d3dc961802764bbc05ef6ea87..7f2e9783104f46731ef944194aaed70a689240f0 100755 (executable)
--- a/gettext-tools/tests/msgmerge-update-4
+++ b/gettext-tools/tests/msgmerge-update-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update with --sort-output: POT-Creation-Date changed. This change
 # must not be reflected in the resulting PO file; this is needed for projects

diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1
index 5cce2751a76b49748a37ef47f2a32927f4edc789..5cddfb0f412b0db70c66fd5d7d6b89dbd69117f0 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-1
+++ b/gettext-tools/tests/msgunfmt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of general operation.
 

diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2
index 39f959b3c5f97452cda1845c2a1f8fede7d67057..3683854a0f48d3cdfc90e679462c5f1ac0d93c35 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-2
+++ b/gettext-tools/tests/msgunfmt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 # Verify that msgunfmt, applied to a .mo file of major revision 1 (with

diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1
index 5061700d6d46456cf51341219579ddeac9981ec4..24797348a297c515e68d8a9611217edbbcf87252 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-csharp-1
+++ b/gettext-tools/tests/msgunfmt-csharp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --csharp option.
 
@@ -54,12 +55,12 @@ msgstr "Fermer"
 EOF
 
 : ${MSGFMT=msgfmt}
-GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
 ${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || exit 1
 
 : ${MSGUNFMT=msgunfmt}
-GETTEXTCSHARPEXEDIR=../src \
-GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPEXEDIR=../../src \
+GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
 ${MSGUNFMT} --csharp -d mu-cs-1 -r prog -l fr -o mu-cs-1/prog.out || exit 1
 
 : ${MSGCAT=msgcat}

diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index ad6e70161788e617207ebf9f115d5fee891d1753..5e6f303ae1abd9ee802357c4268df86e8404e236 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --java option.
 
@@ -61,7 +62,7 @@ ${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || exit 1
 
 : ${MSGUNFMT=msgunfmt}
 CLASSPATH=mu-java-1${CLASSPATH:+:$CLASSPATH} \
-GETTEXTJEXEDIR=../src GETTEXTJAR=../src/gettext.jar \
+GETTEXTJEXEDIR=../../src GETTEXTJAR=../../src/gettext.jar \
 ${MSGUNFMT} --java -d mu-java-1 -r prog -l fr -o mu-java-1/prog.out || exit 1
 
 : ${MSGCAT=msgcat}

diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1
index 7af68bc5144cc0bda054651df7395a37683a0323..0cc7973e51572d733784f07cdfa70c9e426680c2 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-properties-1
+++ b/gettext-tools/tests/msgunfmt-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of general operation with Java .properties syntax.
 

diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index bfe48e0eb830ca16ad66af65a0c626278d314d96..65a239e3bc6188c662d92a14392152772fbf003a 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --tcl option.
 
@@ -48,7 +49,7 @@ ${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || exit 1
 
 tmpfiles="$tmpfiles mu-tcl-1-prog.out"
 : ${MSGUNFMT=msgunfmt}
-GETTEXTDATADIR=${top_srcdir}/src \
+GETTEXTDATADIR=../${top_srcdir}/src \
 ${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || exit 1
 
 tmpfiles="$tmpfiles mu-tcl-1-prog.ok"

diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1
index e137d5138ccddfe7e5091dfa0c8a1d96ae733e44..5616f26bb46eda26d552899af293556bbe117723 100755 (executable)
--- a/gettext-tools/tests/msguniq-1
+++ b/gettext-tools/tests/msguniq-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation.
 
@@ -7,13 +8,13 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -o msguniq-1.tmp ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -o msguniq-1.tmp ../${srcdir}/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/msguniq-a.out msguniq-1.out
+${DIFF} ../${srcdir}/msguniq-a.out msguniq-1.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2
index d8c6a9942a0339cb1bf6cc61f0e4e2bf51c37284..45a54e79db24e55382db7e06f810c8732d62d36b 100755 (executable)
--- a/gettext-tools/tests/msguniq-2
+++ b/gettext-tools/tests/msguniq-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --unique option.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ../${srcdir}/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3
index dcd5ee85a9913e30a53b7c128f5fabc3f485876d..5322b51e5bc72a892259494328fde2ff82e2ada6 100755 (executable)
--- a/gettext-tools/tests/msguniq-3
+++ b/gettext-tools/tests/msguniq-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --repeated option.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ../${srcdir}/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4
index 844b4bc521326771d1cd070cb10883e995c394c1..1cd63b809045b68e53b289eeaaeed3fc60dc4418 100755 (executable)
--- a/gettext-tools/tests/msguniq-4
+++ b/gettext-tools/tests/msguniq-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 
@@ -7,12 +8,12 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-4.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out ${top_srcdir}/tests/msguniq-a.inp
+${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out ../${srcdir}/msguniq-a.inp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-4.ok"
 : ${MSGCAT-msgcat}
-${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok ${top_srcdir}/tests/msguniq-a.out
+${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok ../${srcdir}/msguniq-a.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5
index 3e784e135a55bcc97b641516e21efd4406ad069b..1f98acb8329bb4235d2facba288c9ec2d854ea99 100755 (executable)
--- a/gettext-tools/tests/msguniq-5
+++ b/gettext-tools/tests/msguniq-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msguniq on a PO file with contexts.
 

diff --git a/gettext-tools/tests/msguniq-6 b/gettext-tools/tests/msguniq-6
index c9ded37ea53f61a1baa4ab80659b2354ac3dfc61..3fabbba0210477aa301838e82303b85a12e6c273 100755 (executable)
--- a/gettext-tools/tests/msguniq-6
+++ b/gettext-tools/tests/msguniq-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msguniq on PO file with previous msgids.
 

diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index cb9c75a664fc4ce0636a378887e68453e6140509..944374aa3f5f7d671e99f07d549b0fc2eab2cb06 100644 (file)
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -1,11 +1,12 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles plural-1-cake.tmp plural-1-cake.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c
+${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location ../${srcdir}/plural-1-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -66,15 +67,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || exit 1
 tmpfiles="$tmpfiles plural-1-cake.ok plural-1-cake.tmp cake.out"
 : ${DIFF=diff}
 echo 'un morceau de gateau' > plural-1-cake.ok
-LANGUAGE= ./cake fr 1 > plural-1-cake.tmp || exit 1
+LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
 ${DIFF} plural-1-cake.ok cake.out || exit 1
 echo '2 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ./cake fr 2 > plural-1-cake.tmp || exit 1
+LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
 ${DIFF} plural-1-cake.ok cake.out || exit 1
 echo '10 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ./cake fr 10 > plural-1-cake.tmp || exit 1
+LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
 ${DIFF} plural-1-cake.ok cake.out || exit 1
 

diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2
index 2593ced212e0b3d43f8163ce36cbeb718f07c177..d5ffbb0debb534f3e833f6449bad34b0835cf3e8 100755 (executable)
--- a/gettext-tools/tests/plural-2
+++ b/gettext-tools/tests/plural-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15

diff --git a/gettext-tools/tests/recode-sr-latin-1 b/gettext-tools/tests/recode-sr-latin-1
index 9565a368925b89d7fb247b5e56c6da81bd0fe91c..eca50d07ed063de81316f75a2845d6c454fd4fc0 100755 (executable)
--- a/gettext-tools/tests/recode-sr-latin-1
+++ b/gettext-tools/tests/recode-sr-latin-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recode-sr-latin on some input in UTF-8 encoding.
 
@@ -8,7 +9,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # Test whether a specific UTF-8 locale is installed.
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale 2>/dev/null
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale 2>/dev/null
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;

diff --git a/gettext-tools/tests/recode-sr-latin-2 b/gettext-tools/tests/recode-sr-latin-2
index 83bd83b3605dcc38e144403ee40f8017a956b25b..6fe955907c22ac97e586f051eae3ff1b56ddc43e 100755 (executable)
--- a/gettext-tools/tests/recode-sr-latin-2
+++ b/gettext-tools/tests/recode-sr-latin-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recode-sr-latin on some input in EUC-JP encoding.
 # (Apart from UTF-8 and GB18030, EUC-JP is the only common encoding that is

diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index 69a9fdb559ff07c77be310eab0057ffc9755f872..64e501891185deeffb0410a7aa48d93e84b85b11 100755 (executable)
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # This test often fails during development. It works after "make dist".
 
@@ -11,8 +12,8 @@ tmpfiles="$tmpfiles zero-domain.po xg-test1.err"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext-tools.pot \
-  $top_srcdir/src/xgettext.c >xg-test1.err 2>&1
+${XGETTEXT} -k_ -d zero-domain -x ../$top_srcdir/po/gettext-tools.pot \
+  ../$top_srcdir/src/xgettext.c >xg-test1.err 2>&1
 result=$?
 cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2
index 5e50b508872d948f332b24ae92e0f757422ee324..98424c2abeaed1f1f9f842777c41f0e86c671930 100755 (executable)
--- a/gettext-tools/tests/xgettext-2
+++ b/gettext-tools/tests/xgettext-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Even an empty string is extracted, if not overridden by xgettext's
 # default-constructed header entry.

diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3
index 9e1fb317e289589cca8c4a5baf5b2623ad53dcdf..ad77cd2141a87123842fdeaa888a1a971451cde2 100755 (executable)
--- a/gettext-tools/tests/xgettext-3
+++ b/gettext-tools/tests/xgettext-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # When a header entry is provided by xgettext, it overrides any msgid ""
 # present in the input.

diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4
index f648666d804da28a914ddcb830bc03a04782e17e..db01bbabf4a38526ccab054ed65c120111815879 100755 (executable)
--- a/gettext-tools/tests/xgettext-4
+++ b/gettext-tools/tests/xgettext-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --foreign-user
 

diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5
index c654612db4ec5255cd814396e06485d16a404a41..721cdb56847f459a3ab0a654c6e76b19ca290734 100755 (executable)
--- a/gettext-tools/tests/xgettext-5
+++ b/gettext-tools/tests/xgettext-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test extraction of non-ASCII msgids.
 

diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6
index d0997b5665bf00e22318e487473ef99e24caae74..df577860bc2d4e1bc165e3f268791159f245d387 100755 (executable)
--- a/gettext-tools/tests/xgettext-6
+++ b/gettext-tools/tests/xgettext-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of position dependent recognition of format strings.
 

diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7
index 3eddc1b6497437be77af8892233b3a2386a885e1..adac2c5c5d248c4700c5ffd823b349b1343789c6 100755 (executable)
--- a/gettext-tools/tests/xgettext-7
+++ b/gettext-tools/tests/xgettext-7
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of comment extraction in the case of duplicated msgids.
 

diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8
index 10a4f105497c8cc188091f8d41ad686e1b9f211c..910d76c924c459beb76ed2da968c3d4b3039811c 100755 (executable)
--- a/gettext-tools/tests/xgettext-8
+++ b/gettext-tools/tests/xgettext-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test -j option with charset conversion from ISO-8859-1 to UTF-8.
 

diff --git a/gettext-tools/tests/xgettext-9 b/gettext-tools/tests/xgettext-9
index 75d3576e50da55f695264d0a07ce3f8f04cc4b04..ea38b705089736de1bbd97485e0336e25254ad0b 100755 (executable)
--- a/gettext-tools/tests/xgettext-9
+++ b/gettext-tools/tests/xgettext-9
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of extracted comments specified per keyword, including the case of
 # duplicated msgids.

diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1
index 7d3f9548356e220cd76fb34235fb67ba291a0632..f16ff8d839a8861ba5a11788a9b6d7c5ec6592c5 100755 (executable)
--- a/gettext-tools/tests/xgettext-awk-1
+++ b/gettext-tools/tests/xgettext-awk-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test awk support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2
index 5ff65dcd6effe2999951836a873f830107e45764..c15dbd0600142c3df03cb53f61a146dc750de7ea 100755 (executable)
--- a/gettext-tools/tests/xgettext-awk-2
+++ b/gettext-tools/tests/xgettext-awk-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test awk support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1
index 58bb1930bfa502b3dd208ce1a1bc096a6ecee2d8..f129b99af2365d93384cf5612a699894bdd78bf1 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-1
+++ b/gettext-tools/tests/xgettext-c-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # This test often fails during development. It works after "make dist".
 
@@ -10,13 +11,13 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles xg-c-1.tmp.po xg-c-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \
- $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c
+ ../$top_srcdir/src/xgettext.c ../$top_srcdir/src/msgfmt.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} $top_srcdir/tests/xg-c-1.ok.po xg-c-1.po
+${DIFF} ../$srcdir/xg-c-1.ok.po xg-c-1.po
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10
index bf6fddadca8cf4cc0b922567a8e2f3aeb2354eed..9a6d7beb09bbfc2e150c42064dd95c08fef59c63 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-10
+++ b/gettext-tools/tests/xgettext-c-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts.
 

diff --git a/gettext-tools/tests/xgettext-c-11 b/gettext-tools/tests/xgettext-c-11
index 1dd854fb60e15833d3f462bec79efc52232f8ff1..69d58b4e61e0318ff9c53ba70381e7e3abd5bc65 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-11
+++ b/gettext-tools/tests/xgettext-c-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts, disambiguating according to the
 # argument count.

diff --git a/gettext-tools/tests/xgettext-c-12 b/gettext-tools/tests/xgettext-c-12
index b138dcbb7e5b789b703a0423d1d889c0bcf3b318..8579772d5ae7cd2422acb2a726871efb9f151b45 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-12
+++ b/gettext-tools/tests/xgettext-c-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: valid but unlikely C format strings are _not_ marked as
 # c-format by default.

diff --git a/gettext-tools/tests/xgettext-c-13 b/gettext-tools/tests/xgettext-c-13
index 94d567f0db72996c262aecb278f1e9e28b1d1e75..c78c01b9615beb1e5be012362851f37e6da72e89 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-13
+++ b/gettext-tools/tests/xgettext-c-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test --flag that introduces qt-format.
 

diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-14
index 8368ecea68b3c469ac8f4157a9494d8efaa762bf..790331350d1d64ec5ec0a54784cdd156dc75922e 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-14
+++ b/gettext-tools/tests/xgettext-c-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test boost-format.
 

diff --git a/gettext-tools/tests/xgettext-c-15 b/gettext-tools/tests/xgettext-c-15
index 5cf9252cd57d0ac225ad420362fa890bcb8efae0..85d07060ef7bef6481cb8910540af6c206923c71 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-15
+++ b/gettext-tools/tests/xgettext-c-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts specified in GNOME glib syntax.
 

diff --git a/gettext-tools/tests/xgettext-c-16 b/gettext-tools/tests/xgettext-c-16
index 801ff4900f156a988284437c108d8b391026094e..15c19c8ff8c67c8b27a5db2ed6bce6e49467b3f3 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-16
+++ b/gettext-tools/tests/xgettext-c-16
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17
index 7cae3df29d77df163cb878f754317eba3c2a1d37..169e02004ba7c0812ea0becaa6a421586f306e2b 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-17
+++ b/gettext-tools/tests/xgettext-c-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test kde-format and format recognition heuristics.
 

diff --git a/gettext-tools/tests/xgettext-c-18 b/gettext-tools/tests/xgettext-c-18
index 62457a23632e367213f3545c67e76862d3f886d2..28577ee11d57099c74cc73680c176856815179ed 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-18
+++ b/gettext-tools/tests/xgettext-c-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of 'range:' flags.
 

diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2
index 2c07dc8abc8669f04baced86e750137839201163..c663ded7da577a377365a2af083f41efa0079c60 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-2
+++ b/gettext-tools/tests/xgettext-c-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments meant for xgettext, and whitespace.
 

diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3
index 6cf1d84bada50af77bfca6703686137e7eaa8317..41ef3e1e7b36e5d14484f85590f4bbe48922839b 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-3
+++ b/gettext-tools/tests/xgettext-c-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: recognition of #line.
 

diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4
index e5520dd1141d48b56bc8d974e7e89d2c25758d35..9df69a3c5702afa76bc790037fac17c6a4ebf1a6 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-4
+++ b/gettext-tools/tests/xgettext-c-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --trigraphs option.
 

diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5
index a0bb7987e30e1efe2d833d39e16c1f81cb47c9cf..eff40727a25b418939e83595a3c094bc0b360128 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-5
+++ b/gettext-tools/tests/xgettext-c-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments.
 

diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6
index 050dde38cf922fcf2bbf43fa5212f0dbd2d37f0d..86dfa938988634498cb7d6923816c75cef3d1adc 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-6
+++ b/gettext-tools/tests/xgettext-c-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7
index 8264f0f878770a5fcf696bd7c428accedf00942c..2dcec6011d739dab6090960734c25656894a2816 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-7
+++ b/gettext-tools/tests/xgettext-c-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments.
 

diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8
index 1a085bae81d25125d9042c915fd13a4c8f37c451..43dfebe9a61cb6030ba895577ef8c55576c3d7cc 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-8
+++ b/gettext-tools/tests/xgettext-c-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of ISO C 99 <inttypes.h> format string directives.
 

diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9
index 242df178d2750632472d75410967185f36d0d9be..b75abb82358cec9f24de9f1d50f1ddc6bf602353 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-9
+++ b/gettext-tools/tests/xgettext-c-9
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1
index 9f35c93d45f30647dd290a70409e07bc3270f2b8..0c5b88b836b0900be5a949497e592594d61bf573 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-1
+++ b/gettext-tools/tests/xgettext-csharp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Some tests for C# support
 

diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2
index c5c0f5605927e72a2a566dbab76d09bdcb590b9b..c3c72aaf8c9e185ff01e5b5fe90c3dcdafe3c071 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-2
+++ b/gettext-tools/tests/xgettext-csharp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # More tests for C# support: UTF-8 encoded source files
 

diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3
index c7d287889b48f83512618922649578d56871f2ac..432b218e14f3ada900e4767db2ea391115b18e45 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-3
+++ b/gettext-tools/tests/xgettext-csharp-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # More tests for C# support: string syntax
 

diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4
index 4a32acccf7c537ce867867bbd6ba2742afd5cb5e..a47f8ab09ff11a91068466208a954b75aff9f26e 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-4
+++ b/gettext-tools/tests/xgettext-csharp-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Tests for C# plural keyword support
 

diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5
index 0b0ba3ac057011d47218657e8a0bc26ba5b90ba1..77acd94fb6379ef05fd7dc9b7eabacd3372869af 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-5
+++ b/gettext-tools/tests/xgettext-csharp-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6
index 7a3070821f103e4a0322059fd9d4e19b30598c78..c3714d674c3e3f2cc6dfcdd7c7c524d2ac566a39 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-6
+++ b/gettext-tools/tests/xgettext-csharp-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7
index ac871fdf4bc88b237ec1e6f5a0a1a06e8194973c..38025fe20b615555cdf4dfb803d0d6e666149e0f 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-7
+++ b/gettext-tools/tests/xgettext-csharp-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: extraction of contexts.
 

diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1
index e0086193ab3e23922e291e6efbfb69c9bd0223d4..b9b660d90509a4ce9dfe54ee2fdae55514312ffa 100755 (executable)
--- a/gettext-tools/tests/xgettext-elisp-1
+++ b/gettext-tools/tests/xgettext-elisp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test EmacsLisp support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2
index 85d1395431c4223db06fb5c689258917b8277565..a457858fc9809c7a71ab87609f33724f8861175d 100755 (executable)
--- a/gettext-tools/tests/xgettext-elisp-2
+++ b/gettext-tools/tests/xgettext-elisp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test EmacsLisp support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1
index 5d2aa24e320922cde683f955bc75634ae52f2438..2fd7d351393248ef349abe5da2988588aa37b412 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-1
+++ b/gettext-tools/tests/xgettext-glade-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support.
 

diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index 36c0c3bae052850a00e64652ddc071219b19cad1..780d9efb4547d115167fd4abdaf32b4da90c133d 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support, in particular ISO-8859-1 to UTF-8 conversion
 # and ASCII entities (< > ").

diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3
index f929ae5e340bccbde5b6b7abf71aebcde6a7d696..c4ecc84432b03a8e484e6987ccf7c4569a0374d5 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-3
+++ b/gettext-tools/tests/xgettext-glade-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support.
 

diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4
index f00419f219e73b12dffe520ab9597150237d5f39..546a11033bf502ebb8df8b140ffbcb6c9cb43cf6 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-4
+++ b/gettext-tools/tests/xgettext-glade-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support.
 

diff --git a/gettext-tools/tests/xgettext-glade-5 b/gettext-tools/tests/xgettext-glade-5
index 6354febc3fca16d7b241998cf7f5ba246f20a781..807a63c79bec554179585b955838d3d437e43956 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-5
+++ b/gettext-tools/tests/xgettext-glade-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support for msgctxt.
 

diff --git a/gettext-tools/tests/xgettext-glade-6 b/gettext-tools/tests/xgettext-glade-6
index 90940b795f9226d94958477e888bdda898feee4c..cfc7708767dc7475167ca8e5c0176cba1a74bc50 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-6
+++ b/gettext-tools/tests/xgettext-glade-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of GtkBuilder support.
 # Checks that the extracted pot contains the right translatable

diff --git a/gettext-tools/tests/xgettext-glade-7 b/gettext-tools/tests/xgettext-glade-7
index 09624f85683df515a8f71c6aa2e88480fd9b6252..168c8f443e9e88bf5d6d1f138994ea4d00d43caf 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-7
+++ b/gettext-tools/tests/xgettext-glade-7
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of GtkBuilder support.
 # Checks the extraction of a medium size GtkBuilder file, with

diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1
index 62e1de11d8772ea7fce9b7c67771e603fee0fc6d..d517e9c7470c52bf368f0a9d7c7d7dc37a9057e4 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-1
+++ b/gettext-tools/tests/xgettext-java-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java support
 #

diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2
index bdf0444e9c6f76150f5d230851fffe312ed1bfb5..d7afb2e81f1a9e4c21f7adec974f9d36d78d1011 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-2
+++ b/gettext-tools/tests/xgettext-java-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # More tests for java support
 #

diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3
index 61356dda9a80376e97b76affeeef44f2358a9adb..7adbd1063a4849a34721865fc12d0dc497c7d4c4 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-3
+++ b/gettext-tools/tests/xgettext-java-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #

diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4
index b336766957ea62173a3d825171db0fdcb08912cf..9ed7b8e2490303bacb6ded52d40d2bf1b8e7824a 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-4
+++ b/gettext-tools/tests/xgettext-java-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #

diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5
index 09f3be9ed4ab8e388184f30b8f3144d67b0d4eba..14447cd2af05f9af3403c12570490b471327688c 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-5
+++ b/gettext-tools/tests/xgettext-java-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6
index 862fc47fd3b2e73be143c2f6557259624c8bcad4..91593ed08b9c06c8166f8d34089098fce6938250 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-6
+++ b/gettext-tools/tests/xgettext-java-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7
index caa2b93b8f7cce541d7deceba135fda6c88ea334..b929b5b10e942b3df339221fb5d688765629c3e2 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-7
+++ b/gettext-tools/tests/xgettext-java-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: extraction of contexts.
 

diff --git a/gettext-tools/tests/xgettext-javascript-1 b/gettext-tools/tests/xgettext-javascript-1
index 9862656269f33295c9969cbc6d0973d52ff73960..57a832df7ee65c77d096020b18613e9d2a5e6dd9 100755 (executable)
--- a/gettext-tools/tests/xgettext-javascript-1
+++ b/gettext-tools/tests/xgettext-javascript-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript support.
 

diff --git a/gettext-tools/tests/xgettext-javascript-2 b/gettext-tools/tests/xgettext-javascript-2
index f931b6009e427a8919b5446e42d96d3c2d340f5a..57c6a4121c37a8fa106586ea29707c771b2f8597 100755 (executable)
--- a/gettext-tools/tests/xgettext-javascript-2
+++ b/gettext-tools/tests/xgettext-javascript-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript support.
 # Playing with regex and division operator

diff --git a/gettext-tools/tests/xgettext-javascript-3 b/gettext-tools/tests/xgettext-javascript-3
index 112edda42af406990aff73c5c1605d0ed956fde1..c7dd9565c518850b57d19479fe3441604748abd4 100755 (executable)
--- a/gettext-tools/tests/xgettext-javascript-3
+++ b/gettext-tools/tests/xgettext-javascript-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript support.
 # Playing with concatenation of string literals within the gettext function

diff --git a/gettext-tools/tests/xgettext-javascript-4 b/gettext-tools/tests/xgettext-javascript-4
index 3b4ff47720ae280de9e9b56570c6f4955eaf4a6f..58151eeff49f688cdafd141698fa3fd91ae66867 100755 (executable)
--- a/gettext-tools/tests/xgettext-javascript-4
+++ b/gettext-tools/tests/xgettext-javascript-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript escape sequences in string literals.
 

diff --git a/gettext-tools/tests/xgettext-javascript-5 b/gettext-tools/tests/xgettext-javascript-5
index 6e6164d49a11c9a6174113a9105419e37bc523d6..08b1dc42bc1e516c017daab18815d397d99edc07 100755 (executable)
--- a/gettext-tools/tests/xgettext-javascript-5
+++ b/gettext-tools/tests/xgettext-javascript-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript Unicode support.
 

diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1
index 23cae61c9a7ca45eb4bdb801ee945a1bf2f7bc5e..2f17e6223c46567b35f589df5788e4ec84a8770b 100755 (executable)
--- a/gettext-tools/tests/xgettext-librep-1
+++ b/gettext-tools/tests/xgettext-librep-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test librep support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2
index 72b3c158b270275970bf8b21bda2e14cd0e9c418..518c4685fe610ed974a536a35111c6d8537340de 100755 (executable)
--- a/gettext-tools/tests/xgettext-librep-2
+++ b/gettext-tools/tests/xgettext-librep-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test librep support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1
index 21ebd403dc72c42b6c582e7c4279bafdaa4b0a3c..9f34dc8d748efcd8835b0119bbe72279160e5ef6 100755 (executable)
--- a/gettext-tools/tests/xgettext-lisp-1
+++ b/gettext-tools/tests/xgettext-lisp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lisp support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2
index 86daea8ff7ff7b2cdef3fdfce203cd6a3cf89f26..6aaea225e3d1fbf4f5503677310022cc07b3f8dc 100755 (executable)
--- a/gettext-tools/tests/xgettext-lisp-2
+++ b/gettext-tools/tests/xgettext-lisp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lisp support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1
index bad25b46178aee2dc7293575b97a8adbc29c97da..98270dfbe2e3747a9e8c9110a3a280b8103b2c7e 100755 (executable)
--- a/gettext-tools/tests/xgettext-lua-1
+++ b/gettext-tools/tests/xgettext-lua-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lua support
 

diff --git a/gettext-tools/tests/xgettext-lua-2 b/gettext-tools/tests/xgettext-lua-2
index 4bd9fbbd9e89f127051455dd8ca8e4d131fa365f..46773b770416cba361aaf08cc64b5bedb93561ca 100755 (executable)
--- a/gettext-tools/tests/xgettext-lua-2
+++ b/gettext-tools/tests/xgettext-lua-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lua support
 

diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1
index d2200edd7dec1fceb295ca054ceead7b7503858e..73cacda38338e2b16b93cee385d25bbbac1e851f 100755 (executable)
--- a/gettext-tools/tests/xgettext-objc-1
+++ b/gettext-tools/tests/xgettext-objc-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ObjectiveC extractor.
 

diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2
index e9077d153af219bb3a406d80b4eeac16534d128f..8fdb057ba583e37e37d7ea92a7e1b382d179c5b8 100755 (executable)
--- a/gettext-tools/tests/xgettext-objc-2
+++ b/gettext-tools/tests/xgettext-objc-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ObjectiveC support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1
index 68e1f9f9347da94b33c9974b69cc7fc11a45a403..841e9c6004abaf218e5f7dccd5dc3b630769fb9c 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-1
+++ b/gettext-tools/tests/xgettext-perl-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support.
 

diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2
index 87c835793b2e6ae0b5f7bffffc7f637a387708b1..413d332bf05ca2103fe28d4d8a8fb2e3f70bec80 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-2
+++ b/gettext-tools/tests/xgettext-perl-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support with ISO-8859-1 encoded input.
 

diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3
index 95f5e3418acab477b091ce870c6673a2383a2f46..70fe9345309178cb25e84dd44311b43e22ab836a 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-3
+++ b/gettext-tools/tests/xgettext-perl-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support with UTF-8 encoded input.
 

diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4
index 566b40bccf3578f6910259d254d89fc0b8cd998d..4ab943fb0401ad741e9edfeaa891835f29b7754b 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-4
+++ b/gettext-tools/tests/xgettext-perl-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Tests for the general string extraction facilities of the Perl backend
 # (with option --extract-all).

diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5
index 2783070ced3cb66276980dd04c6e010379036fd5..31ee5a2a4c841b9880fd8d023611693ab11c5bae 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-5
+++ b/gettext-tools/tests/xgettext-perl-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Perl support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-perl-6 b/gettext-tools/tests/xgettext-perl-6
index 02b9820bb397425e88fbb37dc05f2daf77ad6b4a..bda2f669d7e775fe5e6deeb504e91eb34fd018ab 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-6
+++ b/gettext-tools/tests/xgettext-perl-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test whether the right number of arguments are extracted.
 

diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7
index c62de1049315582701099901a5f810e7de63766a..557b002cd5b5211328d6babd9678c1668bcd8d0d 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-7
+++ b/gettext-tools/tests/xgettext-perl-7
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Perl support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-perl-8 b/gettext-tools/tests/xgettext-perl-8
index 74247cd34515ee1ff70374e08179d56e2270586c..2de1b796e49ed97e5b7b6d66e13cd122e4c5dbae 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-8
+++ b/gettext-tools/tests/xgettext-perl-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # The slash (/) and the question mark (?) serve a double-purpose in Perl.
 # Depending on the context they can either be an operator (division

diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1
index eaf749878ba406837bee9dbb7d3bc47838e303c8..36a85f0d1a018d9d48e96fdea7c5c2916fc43fad 100755 (executable)
--- a/gettext-tools/tests/xgettext-php-1
+++ b/gettext-tools/tests/xgettext-php-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2
index 5de8eb551bd8e9a47aac217691dfc84ff33257e7..028e83278493ddceff70f139c1eba4c2adbe3bb4 100755 (executable)
--- a/gettext-tools/tests/xgettext-php-2
+++ b/gettext-tools/tests/xgettext-php-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: here documents.
 

diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3
index 6da2caf52bd1ae90dea9c63d9dce3d0aba1ad161..6623d70e3e2af5c7f50e56955a407ab2433e8029 100755 (executable)
--- a/gettext-tools/tests/xgettext-php-3
+++ b/gettext-tools/tests/xgettext-php-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4
index 4546da3a3099f2c7d57bcba901e08995c19b0020..69ebd81f183bda5e24f8d69185d6f15e0f263c89 100755 (executable)
--- a/gettext-tools/tests/xgettext-php-4
+++ b/gettext-tools/tests/xgettext-php-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: string concatenation.
 

diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1
index 0784ad23b721d00558ebb101b3f69cf1193616c1..60afc493d78a9a9cbbbc5db8a6902522836b6c32 100755 (executable)
--- a/gettext-tools/tests/xgettext-po-1
+++ b/gettext-tools/tests/xgettext-po-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C, C++, PO extractors.
 

diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1
index 2d36a60421da514c0447342da2020277b7f99652..5a11f8d70cf1fabbebc651ffa0bb97d256a1b427 100755 (executable)
--- a/gettext-tools/tests/xgettext-properties-1
+++ b/gettext-tools/tests/xgettext-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C, C++, JavaProperties extractors.
 

diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index 227774c48a90cbc8f876823cb119df610b48d8dc..afa13da044c3cd410a55197b6b4871cd2cae2f71 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Python support.
 

diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2
index 418c9a0de06eb77beff20e5609c728a97e186aa3..340c16808e6668ea1eeccf16c2a0fb2cc9acacd2 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-2
+++ b/gettext-tools/tests/xgettext-python-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
index 2c4a5a7e3d77de37d33ab2fce2e2b81fdde402f1..34cc4adb09dd11526c0ffe56dcc08e74339f3b00 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-3
+++ b/gettext-tools/tests/xgettext-python-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --from-code option and encoding recognition.
 

diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4
index 8b7e62632911f01aecb0622c73be9aa9280cc936..3b62fd903614e6571fee6abb8b5d29fee88b4874 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-4
+++ b/gettext-tools/tests/xgettext-python-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1
index b5d5aa9d7a70cb60425bb6b800f29810ffc513f6..37bc58f0153c32de1969ee6d5693572cf826c7aa 100755 (executable)
--- a/gettext-tools/tests/xgettext-scheme-1
+++ b/gettext-tools/tests/xgettext-scheme-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-scheme-2 b/gettext-tools/tests/xgettext-scheme-2
index e2916a84da031cb4544d88d84cdb41f75d183b24..fcc3665989efe65abfc8ffd6a050b43a5fc61093 100755 (executable)
--- a/gettext-tools/tests/xgettext-scheme-2
+++ b/gettext-tools/tests/xgettext-scheme-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: strings outside any function call.
 

diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3
index b7c69856cbe1523e890e7f5dd935291beb987868..d653d23796c2722f16208f2965678efa823f9593 100755 (executable)
--- a/gettext-tools/tests/xgettext-scheme-3
+++ b/gettext-tools/tests/xgettext-scheme-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1
index b40b509ecd5ebfb772ed0f20e6c6a07b03400d5f..b4e88be1909b88e7a91fac1af5c504e944371490 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-1
+++ b/gettext-tools/tests/xgettext-sh-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support.
 

diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2
index 849e13cb8fcd146c235f19dfc3595d35db3fd8b4..1965d7ea8959f0640ca4d78098b00f9b2eacc67f 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-2
+++ b/gettext-tools/tests/xgettext-sh-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-sh-3 b/gettext-tools/tests/xgettext-sh-3
index 169185db12e3abf0f6074f580a3cd98f370d541e..b06589c425752cd2a5bfe4175bf96134ecefbcf2 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-3
+++ b/gettext-tools/tests/xgettext-sh-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: backslashed double-quotes inside single-quotes.
 

diff --git a/gettext-tools/tests/xgettext-sh-4 b/gettext-tools/tests/xgettext-sh-4
index 8a3b22fd6edbb7ad09d4bcd62d5572b99f9fc142..cc0a9a173c8a5309a9377089c612c13d65898173 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-4
+++ b/gettext-tools/tests/xgettext-sh-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support: obsolete bash $"..." syntax.
 

diff --git a/gettext-tools/tests/xgettext-sh-5 b/gettext-tools/tests/xgettext-sh-5
index 609ec0e53aa72c8417876515ef01fe34a99ea822..710ebabd09a66e09c3166b3a118ab61cbb671aef 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-5
+++ b/gettext-tools/tests/xgettext-sh-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support: bash $(...) syntax.
 

diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6
index 10842d44ae0fb4f2a27a7fcf874df002439a393c..eac4ba1ae1d0b3a991cc3f0e337c8c3b1952dd41 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-6
+++ b/gettext-tools/tests/xgettext-sh-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1
index acbd9a5778d9685f310fd22178c4c2160efb96d8..2fd04a1f567038c3b608041696f6660096bff190 100755 (executable)
--- a/gettext-tools/tests/xgettext-smalltalk-1
+++ b/gettext-tools/tests/xgettext-smalltalk-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Smalltalk support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2
index 5aa51b61584c040ef85d82cff106d75f8d50142c..149bd172c561f8eb10901a3632a65d273625603d 100755 (executable)
--- a/gettext-tools/tests/xgettext-smalltalk-2
+++ b/gettext-tools/tests/xgettext-smalltalk-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Smalltalk support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index d1abf6579ce1331c7a6da7686154b0ee31c8e2ff..b35253396e30ecf4df14ec1df4fb5bc819849483 100755 (executable)
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test extractor of NeXTstep/GNUstep .strings files.
 

diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1
index 373729a44505a7c7dc0737be979c313cbde1a7b4..a8331b2937ecbd308d01d0e0940d1e1b7e6a7bc4 100755 (executable)
--- a/gettext-tools/tests/xgettext-tcl-1
+++ b/gettext-tools/tests/xgettext-tcl-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Tcl support.
 

diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2
index f04e07c0bff7692c44118382c12c487d00e1ab4e..962cd98510c40f4d118e0e9a81eff8558c8d11ab 100755 (executable)
--- a/gettext-tools/tests/xgettext-tcl-2
+++ b/gettext-tools/tests/xgettext-tcl-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Tcl support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3
index 04966b327e3ad1c70e1abc270aa8f2557af694be..0f6ac08a664c77bcdf3ec75aeba7c25079aac338 100755 (executable)
--- a/gettext-tools/tests/xgettext-tcl-3
+++ b/gettext-tools/tests/xgettext-tcl-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Tcl support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-tcl-4 b/gettext-tools/tests/xgettext-tcl-4
index 7893ccbf4b8a35a6b2cff85cc6846ccba0769351..31dd8e1a87f263c4076b24761d7ab46d2d67c0a7 100644 (file)
--- a/gettext-tools/tests/xgettext-tcl-4
+++ b/gettext-tools/tests/xgettext-tcl-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Tcl support: escape sequences.
 

diff --git a/gettext-tools/tests/xgettext-vala-1 b/gettext-tools/tests/xgettext-vala-1
index 7c7e243b2aea9b166bf918701fe02696ac0f76c4..287d59a7a2e67d4b848afda1e852cc83010e196b 100644 (file)
--- a/gettext-tools/tests/xgettext-vala-1
+++ b/gettext-tools/tests/xgettext-vala-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Vala support.
 

diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1
index ea7580591acbe979daf2f1e1a142c3114b5135d5..bb00e2e86bc53b824af46e5f510f690dc05d1d0e 100755 (executable)
--- a/gettext-tools/tests/xgettext-ycp-1
+++ b/gettext-tools/tests/xgettext-ycp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Plural test for YCP
 #

diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2
index 7455d2d85b7a7969630de97e06fdd3405dc33f9b..3c8555695f6b98768f3cd6ad5ea990678507e142 100755 (executable)
--- a/gettext-tools/tests/xgettext-ycp-2
+++ b/gettext-tools/tests/xgettext-ycp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: --add-comments option.
 

diff --git a/gettext-tools/tests/xgettext-ycp-3 b/gettext-tools/tests/xgettext-ycp-3
index 75ca2ad0e30896ba34026e1cb402d8b1665cedc4..7c3716c25463026f72675aeae6a220775215bb31 100755 (executable)
--- a/gettext-tools/tests/xgettext-ycp-3
+++ b/gettext-tools/tests/xgettext-ycp-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: string literal concatenation.
 

diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4
index a05539470882e28873164b89cc9e6a2a9621d474..75728e9940efdfffd49534a2430cd03dfc35c5e3 100755 (executable)
--- a/gettext-tools/tests/xgettext-ycp-4
+++ b/gettext-tools/tests/xgettext-ycp-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: --add-comments option.