From: Bruno Haible <bruno@clisp.org>
Date: Sun, 25 Nov 2018 01:10:23 +0000 (+0100)
Subject: Fix some mingw test failures.
X-Git-Tag: v0.20~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14150e03ef3675efe3f29fedc4a069bef596592b;p=thirdparty%2Fgettext.git

Fix some mingw test failures.

* gettext-tools/tests/init-env.in (wabs_srcdir, wabs_top_srcdir): New variables.
(GETTEXTDATADIR): On mingw, use native Windows syntax.
* gettext-tools/tests/format-c-3: Use wabs_srcdir instead of abs_srcdir, and
wabs_top_srcdir instead of abs_top_srcdir.
* gettext-tools/tests/format-c-4: Likewise.
* gettext-tools/tests/format-c-5: Likewise.
* gettext-tools/tests/gettextpo-1: Likewise.
* gettext-tools/tests/intl-1: Likewise.
* gettext-tools/tests/intl-2: Likewise.
* gettext-tools/tests/intl-3: Likewise.
* gettext-tools/tests/intl-4: Likewise.
* gettext-tools/tests/intl-setlocale-1: Likewise.
* gettext-tools/tests/intl-setlocale-2: Likewise.
* gettext-tools/tests/intl-thread-1: Likewise.
* gettext-tools/tests/intl-thread-2: Likewise.
* gettext-tools/tests/intl-thread-3: Likewise.
* gettext-tools/tests/msgfmt-qt-1: Likewise.
* gettext-tools/tests/msgfmt-qt-2: Likewise.
* gettext-tools/tests/msginit-3: Likewise.
* gettext-tools/tests/msginit-4: Likewise.
* gettext-tools/tests/msgmerge-compendium-5: Likewise.
* gettext-tools/tests/msgmerge-compendium-6: Likewise.
* gettext-tools/tests/msgunfmt-3: Likewise.
* gettext-tools/tests/msgunfmt-tcl-1: Likewise.
* gettext-tools/tests/msguniq-1: Likewise.
* gettext-tools/tests/msguniq-2: Likewise.
* gettext-tools/tests/msguniq-3: Likewise.
* gettext-tools/tests/msguniq-4: Likewise.
* gettext-tools/tests/plural-1: Likewise.
* gettext-tools/tests/xgettext-1: Likewise.
* gettext-tools/tests/xgettext-c-1: Likewise.
* gettext-tools/tests/xgettext-c-comment-6: Likewise.
* gettext-tools/tests/xgettext-c-escape-3: Likewise.
* gettext-tools/tests/xgettext-vala-2: Likewise.
---

diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index de59476ab..3fb9c3703 100755
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -4,7 +4,7 @@
 # Test ISO C 99 <inttypes.h> format string directives.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c || Exit 1
+${XGETTEXT} -o fc3.tmp --omit-header --no-location "$wabs_srcdir"/format-c-3-prg.c || Exit 1
 LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || Exit 1
 
 cat <<EOF > fc3.ok
diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index 6f76eb6ae..accd1173c 100755
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -4,7 +4,7 @@
 # Test ISO C 99 <inttypes.h> format string directives with plural forms.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c || Exit 1
+${XGETTEXT} -o fc4.tmp --omit-header --no-location "$wabs_srcdir"/format-c-4-prg.c || Exit 1
 LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || Exit 1
 
 cat <<EOF > fc4.ok
diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 1528b17a4..b8111eed3 100755
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -4,7 +4,7 @@
 # Test 'I' format directive flag.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c || Exit 1
+${XGETTEXT} -o fc5.tmp --omit-header --no-location "$wabs_srcdir"/format-c-5-prg.c || Exit 1
 LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || Exit 1
 
 cat <<EOF > fc5.ok
diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1
index 2ad641ed0..f95aba0a4 100755
--- a/gettext-tools/tests/gettextpo-1
+++ b/gettext-tools/tests/gettextpo-1
@@ -2,7 +2,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the libgettextpo library.
-../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null || Exit 1
+../gettextpo-1-prg${EXEEXT} "$wabs_srcdir"/gettextpo-1.de.po > /dev/null || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po || Exit 1
diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in
index cddc5f9bd..9f150bc78 100644
--- a/gettext-tools/tests/init-env.in
+++ b/gettext-tools/tests/init-env.in
@@ -1,10 +1,6 @@
 # Variable needed by LTLIBINTL.
 top_builddir=../..
 
-# Variable needed by xgettext.
-GETTEXTDATADIR="$abs_top_srcdir"
-export GETTEXTDATADIR
-
 OBJEXT="@OBJEXT@"
 EXEEXT="@EXEEXT@"
 CC="@CC@"
@@ -29,6 +25,23 @@ LOCALE_DE_UTF8="@LOCALE_DE_UTF8@"
 host_os="@host_os@"
 ARCHIVE_VERSION="@ARCHIVE_VERSION@"
 
+# For specific filename variables, define a variant that - in mingw builds
+# in a Cygwin environment - has the Windows filename syntax.
+wabs_srcdir="$abs_srcdir"
+wabs_top_srcdir="$abs_top_srcdir"
+case "$host_os" in
+  mingw*)
+    if (cygpath --version) >/dev/null 2>/dev/null; then
+      wabs_srcdir=`cygpath -w "$abs_srcdir"`
+      wabs_top_srcdir=`cygpath -w "$abs_top_srcdir"`
+    fi
+    ;;
+esac
+
+# Variable needed by xgettext.
+GETTEXTDATADIR="$wabs_top_srcdir"
+export GETTEXTDATADIR
+
 : ${GETTEXT=tstgettext}
 : ${NGETTEXT=tstngettext}
 : ${XGETTEXT=xgettext}
diff --git a/gettext-tools/tests/intl-1 b/gettext-tools/tests/intl-1
index e352a6c89..76fb75e0e 100755
--- a/gettext-tools/tests/intl-1
+++ b/gettext-tools/tests/intl-1
@@ -8,7 +8,7 @@ test -d in-1/fr || mkdir in-1/fr
 test -d in-1/fr/LC_MESSAGES || mkdir in-1/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-1/fr/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-1.po
+${MSGFMT} -o in-1/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-1.po
 
 : ${DIFF=diff}
 cat <<EOF > in-1.ok
diff --git a/gettext-tools/tests/intl-2 b/gettext-tools/tests/intl-2
index f2cc7ab8f..a061d57ab 100755
--- a/gettext-tools/tests/intl-2
+++ b/gettext-tools/tests/intl-2
@@ -8,14 +8,14 @@ test -d in-2-1/fr || mkdir in-2-1/fr
 test -d in-2-1/fr/LC_MESSAGES || mkdir in-2-1/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-2-1/fr/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-2-1.po
+${MSGFMT} -o in-2-1/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-2-1.po
 
 test -d in-2-2 || mkdir in-2-2
 test -d in-2-2/fr || mkdir in-2-2/fr
 test -d in-2-2/fr/LC_MESSAGES || mkdir in-2-2/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-2-2/fr/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-2-2.po
+${MSGFMT} -o in-2-2/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-2-2.po
 
 : ${DIFF=diff}
 cat <<EOF > in-2-1.ok
diff --git a/gettext-tools/tests/intl-3 b/gettext-tools/tests/intl-3
index d33231966..4879e24ed 100755
--- a/gettext-tools/tests/intl-3
+++ b/gettext-tools/tests/intl-3
@@ -8,14 +8,14 @@ test -d in-3-1/fr || mkdir in-3-1/fr
 test -d in-3-1/fr/LC_MESSAGES || mkdir in-3-1/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-3-1/fr/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-2-1.po
+${MSGFMT} -o in-3-1/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-2-1.po
 
 test -d in-3-2 || mkdir in-3-2
 test -d in-3-2/fr || mkdir in-3-2/fr
 test -d in-3-2/fr/LC_MESSAGES || mkdir in-3-2/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-3-2/fr/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-2-2.po
+${MSGFMT} -o in-3-2/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-2-2.po
 
 : ${DIFF=diff}
 cat <<EOF > in-3-1.ok
diff --git a/gettext-tools/tests/intl-4 b/gettext-tools/tests/intl-4
index 271d17547..3b5fce795 100755
--- a/gettext-tools/tests/intl-4
+++ b/gettext-tools/tests/intl-4
@@ -9,7 +9,7 @@ test -d in-4/fr || mkdir in-4/fr
 test -d in-4/fr/LC_MESSAGES || mkdir in-4/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-4/fr/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-4.po
+${MSGFMT} -o in-4/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-4.po
 
 # This test works only on systems that have a traditional french locale
 # installed.
diff --git a/gettext-tools/tests/intl-setlocale-1 b/gettext-tools/tests/intl-setlocale-1
index 15181a5a8..4848763da 100755
--- a/gettext-tools/tests/intl-setlocale-1
+++ b/gettext-tools/tests/intl-setlocale-1
@@ -37,8 +37,8 @@ test -d in-sl-1/fr_FR || mkdir in-sl-1/fr_FR
 test -d in-sl-1/fr_FR/LC_MESSAGES || mkdir in-sl-1/fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-sl-1/de_DE/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-setlocale-1-1.po
-${MSGFMT} -o in-sl-1/fr_FR/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-setlocale-1-2.po
+${MSGFMT} -o in-sl-1/de_DE/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-setlocale-1-1.po
+${MSGFMT} -o in-sl-1/fr_FR/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-setlocale-1-2.po
 
 cat <<EOF > in-sl-1.ok
 String1 - Lang1: 1st string
diff --git a/gettext-tools/tests/intl-setlocale-2 b/gettext-tools/tests/intl-setlocale-2
index 23cd6c366..87d530bb8 100755
--- a/gettext-tools/tests/intl-setlocale-2
+++ b/gettext-tools/tests/intl-setlocale-2
@@ -37,7 +37,7 @@ test -d in-sl-2/de_DE || mkdir in-sl-2/de_DE
 test -d in-sl-2/de_DE/LC_MESSAGES || mkdir in-sl-2/de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-sl-2/de_DE/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-setlocale-2.po
+${MSGFMT} -o in-sl-2/de_DE/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-setlocale-2.po
 
 ../intl-setlocale-2-prg || Exit 1
 
diff --git a/gettext-tools/tests/intl-thread-1 b/gettext-tools/tests/intl-thread-1
index 61d37659e..b702bef1a 100755
--- a/gettext-tools/tests/intl-thread-1
+++ b/gettext-tools/tests/intl-thread-1
@@ -9,7 +9,7 @@ test -d in-th-1/fr || mkdir in-th-1/fr
 test -d in-th-1/fr/LC_MESSAGES || mkdir in-th-1/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-th-1/fr/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-1.po
+${MSGFMT} -o in-th-1/fr/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-1.po
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
diff --git a/gettext-tools/tests/intl-thread-2 b/gettext-tools/tests/intl-thread-2
index 038ce51f6..9be950aeb 100755
--- a/gettext-tools/tests/intl-thread-2
+++ b/gettext-tools/tests/intl-thread-2
@@ -14,8 +14,8 @@ test -d in-th-2/de || mkdir in-th-2/de
 test -d in-th-2/de/LC_MESSAGES || mkdir in-th-2/de/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-th-2/fr/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-2-1.po
-${MSGFMT} -o in-th-2/de/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-2-2.po
+${MSGFMT} -o in-th-2/fr/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-2-1.po
+${MSGFMT} -o in-th-2/de/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-2-2.po
 
 : ${DIFF=diff}
 cat <<EOF > in-th-2.ok
diff --git a/gettext-tools/tests/intl-thread-3 b/gettext-tools/tests/intl-thread-3
index 9ca30dee8..6e35f3636 100755
--- a/gettext-tools/tests/intl-thread-3
+++ b/gettext-tools/tests/intl-thread-3
@@ -13,7 +13,7 @@ test -d in-th-3/fr || mkdir in-th-3/fr
 test -d in-th-3/fr/LC_MESSAGES || mkdir in-th-3/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o in-th-3/fr/LC_MESSAGES/tstthread.mo "$abs_srcdir"/intl-thread-3.po
+${MSGFMT} -o in-th-3/fr/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-3.po
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index 030858022..a9ffa2587 100755
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -4,7 +4,7 @@
 # Test output in Qt .qm format.
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || Exit 1
+${MSGFMT} --qt -o mf-qt-1.qm "$wabs_srcdir"/qttest_pl.po || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2
index 482ef1996..8b8ff37ca 100755
--- a/gettext-tools/tests/msgfmt-qt-2
+++ b/gettext-tools/tests/msgfmt-qt-2
@@ -4,7 +4,7 @@
 # Test msgfmt --qt on a PO file with contexts.
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || Exit 1
+${MSGFMT} --qt "$wabs_srcdir"/qttest2_de.po -o mf-qt-2.qm || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msginit-3 b/gettext-tools/tests/msginit-3
index 222359590..4f6fcd49f 100755
--- a/gettext-tools/tests/msginit-3
+++ b/gettext-tools/tests/msginit-3
@@ -37,7 +37,7 @@ msgstr ""
 EOF
 
 : ${MSGINIT=msginit}
-GETTEXTLIBDIR_SRCDIR="$abs_top_srcdir"/src \
+GETTEXTLIBDIR_SRCDIR="$wabs_top_srcdir"/src \
 ${MSGINIT} -l ga_IE --no-translator -o mi-test3.tmp 2>mi-test3.err
 test $? = 0 || { cat mi-test3.err 1>&2; Exit 1; }
 
diff --git a/gettext-tools/tests/msginit-4 b/gettext-tools/tests/msginit-4
index ac58dfebe..50b295fc0 100755
--- a/gettext-tools/tests/msginit-4
+++ b/gettext-tools/tests/msginit-4
@@ -44,9 +44,9 @@ msgstr ""
 EOF
 
 : ${MSGINIT=msginit}
-GETTEXTLIBDIR_SRCDIR="$abs_top_srcdir"/src \
+GETTEXTLIBDIR_SRCDIR="$wabs_top_srcdir"/src \
 GETTEXTLIBDIR_BUILDDIR="$top_builddir"/src \
-GETTEXTCLDRDIR="$abs_srcdir" \
+GETTEXTCLDRDIR="$wabs_srcdir" \
 ${MSGINIT} -i mi-test4.pot -l foo --no-translator --no-wrap -o mi-test4.tmp 2>mi-test4.err
 test $? = 0 || { cat mi-test4.err 1>&2; Exit 1; }
 
diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5
index 5c28dd151..70f411944 100755
--- a/gettext-tools/tests/msgmerge-compendium-5
+++ b/gettext-tools/tests/msgmerge-compendium-5
@@ -5,8 +5,8 @@
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-5.tmp \
-  --compendium "$abs_srcdir"/mm-viet.comp.po \
-  /dev/null "$abs_srcdir"/mm-viet.pot || Exit 1
+  --compendium "$wabs_srcdir"/mm-viet.comp.po \
+  /dev/null "$wabs_srcdir"/mm-viet.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out || Exit 1
 
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
index d5e773157..7be7f9343 100755
--- a/gettext-tools/tests/msgmerge-compendium-6
+++ b/gettext-tools/tests/msgmerge-compendium-6
@@ -8,53 +8,53 @@
 #       mm-ko.utf-8.pot   mm-ko.utf-8.po    mm-ko-comp.utf-8.po
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$abs_srcdir"/mm-ko.ascii.pot
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$wabs_srcdir"/mm-ko.ascii.pot
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po "$abs_srcdir"/mm-ko.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po "$wabs_srcdir"/mm-ko.euc-kr.po
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$abs_srcdir"/mm-ko-comp.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$wabs_srcdir"/mm-ko-comp.euc-kr.po
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEE.tmp \
-  --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+  --compendium "$wabs_srcdir"/mm-ko-comp.euc-kr.po \
+  "$wabs_srcdir"/mm-ko.euc-kr.po "$wabs_srcdir"/mm-ko.ascii.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+  "$wabs_srcdir"/mm-ko.euc-kr.po "$wabs_srcdir"/mm-ko.ascii.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUE.tmp \
-  --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+  --compendium "$wabs_srcdir"/mm-ko-comp.euc-kr.po \
+  mm-ko.utf-8.po "$wabs_srcdir"/mm-ko.ascii.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+  mm-ko.utf-8.po "$wabs_srcdir"/mm-ko.ascii.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEE.tmp \
-  --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
+  --compendium "$wabs_srcdir"/mm-ko-comp.euc-kr.po \
+  "$wabs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
+  "$wabs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUE.tmp \
-  --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
+  --compendium "$wabs_srcdir"/mm-ko-comp.euc-kr.po \
   mm-ko.utf-8.po mm-ko.utf-8.pot || Exit 1
 LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out || Exit 1
 
diff --git a/gettext-tools/tests/msgunfmt-3 b/gettext-tools/tests/msgunfmt-3
index b9dbf12f4..be72272b4 100755
--- a/gettext-tools/tests/msgunfmt-3
+++ b/gettext-tools/tests/msgunfmt-3
@@ -6,13 +6,13 @@
 : ${MSGUNFMT=msgunfmt}
 
 for f in overflow-1.mo overflow-2.mo overflow-3.mo overflow-4.mo overflow-5.mo overflow-6.mo; do
-  LANGUAGE= LC_ALL=C ${MSGUNFMT} "$abs_srcdir"/$f 2>mu-3.err >/dev/null
+  LANGUAGE= LC_ALL=C ${MSGUNFMT} "$wabs_srcdir"/$f 2>mu-3.err >/dev/null
   test $? != 0 || Exit 1
   grep ' is truncated' mu-3.err >/dev/null || Exit 1
 done
 
 for f in sysdep-without-nul.mo; do
-  LANGUAGE= LC_ALL=C ${MSGUNFMT} "$abs_srcdir"/$f 2>mu-3.err >/dev/null
+  LANGUAGE= LC_ALL=C ${MSGUNFMT} "$wabs_srcdir"/$f 2>mu-3.err >/dev/null
   test $? != 0 || Exit 1
   grep ' not NUL terminated' mu-3.err >/dev/null || Exit 1
 done
diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index 07facf944..e1bc9e2c6 100755
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -42,7 +42,7 @@ test -d mu-tcl-1-msgs || mkdir mu-tcl-1-msgs
 ${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-GETTEXTTCLDIR="$abs_top_srcdir"/src \
+GETTEXTTCLDIR="$wabs_top_srcdir"/src \
 ${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || Exit 1
 
 cat <<\EOF > mu-tcl-1-prog.ok
diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1
index b96238eba..de78c5486 100755
--- a/gettext-tools/tests/msguniq-1
+++ b/gettext-tools/tests/msguniq-1
@@ -4,7 +4,7 @@
 # Test general operation.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$wabs_srcdir"/msguniq-a.in || Exit 1
 LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out || Exit 1
 
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2
index 234274aec..fdf9140f2 100755
--- a/gettext-tools/tests/msguniq-2
+++ b/gettext-tools/tests/msguniq-2
@@ -4,7 +4,7 @@
 # Test --unique option.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$wabs_srcdir"/msguniq-a.in || Exit 1
 LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out || Exit 1
 
 cat <<\EOF > msguniq-2.ok
diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3
index 0949d9d8f..b05623e5f 100755
--- a/gettext-tools/tests/msguniq-3
+++ b/gettext-tools/tests/msguniq-3
@@ -4,7 +4,7 @@
 # Test --repeated option.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$wabs_srcdir"/msguniq-a.in || Exit 1
 LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out || Exit 1
 
 cat <<\EOF > msguniq-3.ok
diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4
index e4e5e48a3..94ea0651f 100755
--- a/gettext-tools/tests/msguniq-4
+++ b/gettext-tools/tests/msguniq-4
@@ -4,10 +4,10 @@
 # Test general operation with Java .properties syntax.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp || Exit 1
+${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$wabs_srcdir"/msguniq-a.inp || Exit 1
 
 : ${MSGCAT-msgcat}
-${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out || Exit 1
+${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$wabs_srcdir"/msguniq-a.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} msguniq-4.ok msguniq-4.out
diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index f5040dc7a..84ad7d2bd 100755
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -2,7 +2,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c || Exit 1
+${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$wabs_srcdir"/plural-1-prg.c || Exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || Exit 1
 
 cat <<EOF > plural-1-cake.ok
diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index 29695a369..8313c18da 100755
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -8,8 +8,8 @@
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -k_ -d zero-domain -x "$abs_top_srcdir"/po/gettext-tools.pot \
-  "$abs_top_srcdir"/src/xgettext.c >xg-test1.err 2>&1
+${XGETTEXT} -k_ -d zero-domain -x "$wabs_top_srcdir"/po/gettext-tools.pot \
+  "$wabs_top_srcdir"/src/xgettext.c >xg-test1.err 2>&1
 result=$?
 cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ '
 test $result = 0 || { Exit 1; }
diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1
index b1b5e1087..eae820536 100755
--- a/gettext-tools/tests/xgettext-c-1
+++ b/gettext-tools/tests/xgettext-c-1
@@ -7,7 +7,7 @@
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \
- "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c || Exit 1
+ "$wabs_top_srcdir"/src/xgettext.c "$wabs_top_srcdir"/src/msgfmt.c || Exit 1
 LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po || Exit 1
 
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/xgettext-c-comment-6 b/gettext-tools/tests/xgettext-c-comment-6
index b1a475ad1..6cde93e70 100755
--- a/gettext-tools/tests/xgettext-c-comment-6
+++ b/gettext-tools/tests/xgettext-c-comment-6
@@ -6,7 +6,7 @@
 : ${XGETTEXT=xgettext}
 
 ${XGETTEXT} --from-code=ISO-8859-1 --add-comments --no-location --no-wrap \
-            -o xg-c-comment-6.tmp "$abs_srcdir"/xg-c-comment-6.c || Exit 1
+            -o xg-c-comment-6.tmp "$wabs_srcdir"/xg-c-comment-6.c || Exit 1
 grep -v 'POT-Creation-Date' < xg-c-comment-6.tmp > xg-c-comment-6.tmq || Exit 1
 LC_ALL=C tr -d '\r' < xg-c-comment-6.tmq > xg-c-comment-6.po || Exit 1
 
diff --git a/gettext-tools/tests/xgettext-c-escape-3 b/gettext-tools/tests/xgettext-c-escape-3
index ee6e8555a..3ad9358b6 100755
--- a/gettext-tools/tests/xgettext-c-escape-3
+++ b/gettext-tools/tests/xgettext-c-escape-3
@@ -6,7 +6,7 @@
 : ${XGETTEXT=xgettext}
 
 ${XGETTEXT} --no-location --no-wrap \
-            -o xg-c-escape-3.tmp "$abs_srcdir"/xg-c-escape-3.c || Exit 1
+            -o xg-c-escape-3.tmp "$wabs_srcdir"/xg-c-escape-3.c || Exit 1
 grep -v 'POT-Creation-Date' < xg-c-escape-3.tmp > xg-c-escape-3.tmq || Exit 1
 LC_ALL=C tr -d '\r' < xg-c-escape-3.tmq > xg-c-escape-3.po || Exit 1
 
diff --git a/gettext-tools/tests/xgettext-vala-2 b/gettext-tools/tests/xgettext-vala-2
index 66f688e3a..b6ea86ea8 100755
--- a/gettext-tools/tests/xgettext-vala-2
+++ b/gettext-tools/tests/xgettext-vala-2
@@ -6,7 +6,7 @@
 : ${XGETTEXT=xgettext}
 
 ${XGETTEXT} --from-code=ISO-8859-1 --add-comments --no-location --no-wrap \
-            -o xg-vala-2.tmp "$abs_srcdir"/xg-vala-2.vala || Exit 1
+            -o xg-vala-2.tmp "$wabs_srcdir"/xg-vala-2.vala || Exit 1
 grep -v 'POT-Creation-Date' < xg-vala-2.tmp > xg-vala-2.tmq || Exit 1
 LC_ALL=C tr -d '\r' < xg-vala-2.tmq > xg-vala-2.po || Exit 1