Avoid test failures on 32-bit Cygwin in a 64-bit Cygwin environment.

In this situation, argv[0] is absolute, even though the program was invoked
as a file name without slashes (and thus found in $PATH).

* gettext-tools/tests/msgcmp-2: Normalize the program name better.
* gettext-tools/tests/msgcmp-3: Likewise.
* gettext-tools/tests/msgfmt-7: Likewise.
* gettext-tools/tests/msgfmt-8: Likewise.
* gettext-tools/tests/msgfmt-9: Likewise.
* gettext-tools/tests/msgfmt-10: Likewise.
* gettext-tools/tests/msgmerge-2: Likewise.
* gettext-tools/tests/msgmerge-9: Likewise.

diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2
index 9adc65169d8a3a70c94d4aed1b3e8f6615f1c2a1..a63cc6a2b5685f86af96bdca5d63957125105e68 100755 (executable)
--- a/gettext-tools/tests/msgcmp-2
+++ b/gettext-tools/tests/msgcmp-2
@@ -18,7 +18,7 @@ EOF
 
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test2.out
+${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' -e 's|^/cygdrive/[^ ]*/msgcmp|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test2.out
 
 cat <<EOF > mc-test2.ok
 mc-test2.in2:1: this message is used but not defined...

diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3
index e303ff0c89152e1010bd0620563b96f4ede1b00b..f79fd23f121fab9e521103719091408c2fe91e34 100755 (executable)
--- a/gettext-tools/tests/msgcmp-3
+++ b/gettext-tools/tests/msgcmp-3
@@ -18,7 +18,7 @@ EOF
 
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test3.out
+${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' -e 's|^/cygdrive/[^ ]*/msgcmp|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test3.out
 
 cat <<EOF > mc-test3.ok
 mc-test3.in2:1: this message is used but not defined...

diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index 8b38f19d41181106b1429bda8ba24cfbb2a4bed2..684354b8d1e57a45bdd5b2c3eb658f01dad8372b 100755 (executable)
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -64,7 +64,7 @@ EOF
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --check -o /dev/null mf-test10.po2 \
-    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test10.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' -e 's|^/cygdrive/[^ ]*/msgfmt|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test10.err
 
 cat << EOF > mf-test10.ok
 mf-test10.po2:6: warning: header field 'Language-Team' missing in header

diff --git a/gettext-tools/tests/msgfmt-7 b/gettext-tools/tests/msgfmt-7
index f07a6b044b69e8780b991d8667affd69efb9ba0e..79717a1507314771eb191b93c0962c76b0149c8c 100755 (executable)
--- a/gettext-tools/tests/msgfmt-7
+++ b/gettext-tools/tests/msgfmt-7
@@ -26,7 +26,7 @@ EOF
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test7.in1 -o /dev/null \
-    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test7.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' -e 's|^/cygdrive/[^ ]*/msgfmt|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test7.err
 
 cat << EOF > mf-test7.ok
 mf-test7.in1:17: duplicate message definition...

diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8
index 9afea693803ba31d5ce3a5356d06018adcf06e32..9ec1c1eae22e0e932af40e49bade7e5559416b3c 100755 (executable)
--- a/gettext-tools/tests/msgfmt-8
+++ b/gettext-tools/tests/msgfmt-8
@@ -26,7 +26,7 @@ EOF
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test8.in1 -o /dev/null \
-    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test8.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' -e 's|^/cygdrive/[^ ]*/msgfmt|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test8.err
 
 cat << EOF > mf-test8.ok
 mf-test8.in1:17: duplicate message definition...

diff --git a/gettext-tools/tests/msgfmt-9 b/gettext-tools/tests/msgfmt-9
index 316bacfece38310276100f152bcbf16c8fcf1577..e3269bc2bd08c411ca8fbbddeb990a9859901086 100755 (executable)
--- a/gettext-tools/tests/msgfmt-9
+++ b/gettext-tools/tests/msgfmt-9
@@ -29,7 +29,7 @@ EOF
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test9.in1 -o /dev/null \
-    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test9.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' -e 's|^msgfmt\.exe|msgfmt|' -e 's|^/cygdrive/[^ ]*/msgfmt|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test9.err
 
 cat << EOF > mf-test9.ok
 mf-test9.in1:17: duplicate message definition...

diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2
index b2b75279b57448e6f1ca6abd1587a5517d57b919..8ff5134140b54ae5fbe4f4efbf76bf653575780f 100755 (executable)
--- a/gettext-tools/tests/msgmerge-2
+++ b/gettext-tools/tests/msgmerge-2
@@ -18,7 +18,7 @@ EOF
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o /dev/stdout mm-test2.in1 mm-test2.in2 \
-  2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test2.out
+  2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' -e 's|^/cygdrive/[^ ]*/msgmerge|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test2.out
 
 cat << EOF > mm-test2.ok
 mm-test2.in1:3: duplicate message definition...

diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9
index 0fae9a35c2b1d53a4fb83f9faf4c861a394d9c3d..353c74a73772027f0a84f22246b2fc1ddffd9be9 100755 (executable)
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-9
@@ -21,7 +21,7 @@ EOF
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o /dev/null mm-test9.in1 mm-test9.in2 \
-    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test9.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' -e 's|^/cygdrive/[^ ]*/msgmerge|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test9.err
 
 cat << EOF > mm-test9.ok
 mm-test9.in1:3: duplicate message definition...