Avoid test suite failures on mingw.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 5680b2718ec661b6d9542350428ea95520fc4293..36d045b037e3ae93d90171b247db21ebb797a6fc 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-14  Bruno Haible  <bruno@clisp.org>
+
+       Avoid test suite failures on mingw.
+       * msgcmp-2: Reduce the file name in the error output.
+       * msgcmp-3: Likewise.
+       * msgfmt-7: Likewise.
+       * msgfmt-8: Likewise.
+       * msgfmt-9: Likewise.
+       * msgfmt-10: Likewise.
+       * msgmerge-2: Likewise.
+       * msgmerge-9: Likewise.
+
 2007-05-14  Bruno Haible  <bruno@clisp.org>
 
        Avoid test suite failures on mingw.

diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2
index 92e778058b2b998e995c5d50ba4569e5e7c3aff7..d8655852894cabbbc50c956b57261bf6f6214544 100755 (executable)
--- a/gettext-tools/tests/msgcmp-2
+++ b/gettext-tools/tests/msgcmp-2
@@ -22,7 +22,7 @@ EOF
 tmpfiles="$tmpfiles mc-test2.out"
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | tr -d '\r' > mc-test2.out
+${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' | tr -d '\r' > mc-test2.out
 
 tmpfiles="$tmpfiles mc-test2.ok"
 cat <<EOF > mc-test2.ok

diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3
index d7855189388cea9aa6afb12b04ddda6fe133513e..3801ebd1d46d42c5111addd0d93dc1cd078a6b09 100755 (executable)
--- a/gettext-tools/tests/msgcmp-3
+++ b/gettext-tools/tests/msgcmp-3
@@ -22,7 +22,7 @@ EOF
 tmpfiles="$tmpfiles mc-test3.out"
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | 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|' | tr -d '\r' > mc-test3.out
 
 tmpfiles="$tmpfiles mc-test3.ok"
 cat <<EOF > mc-test3.ok

diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index 0eee57c84188ffe8c6bd02d7d477d0846322fe24..e2c93b0c8fccc94435d4c539f948d0ad55167580 100755 (executable)
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -70,7 +70,7 @@ tmpfiles="$tmpfiles mf-test10.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --check -o /dev/null mf-test10.po2 \
-    2>&1 | grep -v '^==' | tr -d '\r' > mf-test10.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | tr -d '\r' > mf-test10.err
 
 tmpfiles="$tmpfiles mf-test10.ok"
 cat << EOF > mf-test10.ok

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

diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8
index 07d85011fedea714c202437c625d45e3a52a2085..2694f2340d41d39bcc1f9338d1e450a886bc11b4 100755 (executable)
--- a/gettext-tools/tests/msgfmt-8
+++ b/gettext-tools/tests/msgfmt-8
@@ -30,7 +30,7 @@ tmpfiles="$tmpfiles mf-test8.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test8.in1 -o /dev/null \
-    2>&1 | grep -v '^==' | tr -d '\r' > mf-test8.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | tr -d '\r' > mf-test8.err
 
 tmpfiles="$tmpfiles mf-test8.ok"
 cat << EOF > mf-test8.ok

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

diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2
index 0d7ceb1168e776542a9dd46ac59a9d1c755a7940..07a4edd1b370ba70bca82c288205e7bbb6ba020a 100755 (executable)
--- a/gettext-tools/tests/msgmerge-2
+++ b/gettext-tools/tests/msgmerge-2
@@ -22,7 +22,7 @@ tmpfiles="$tmpfiles mm-test2.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o /dev/stdout mm-test2.in1 mm-test2.in2 \
-  2>&1 | grep -v '^==' > mm-test2.out
+  2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' > mm-test2.out
 
 tmpfiles="$tmpfiles mm-test2.ok"
 cat << EOF > mm-test2.ok

diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9
index 3d98c48688ced0ec7388da896c7f5a5349a9cc5e..ffa75edbab70dae5e93963e0c658e78192e2d58f 100755 (executable)
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-9
@@ -25,7 +25,7 @@ tmpfiles="$tmpfiles mm-test9.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o /dev/null mm-test9.in1 mm-test9.in2 \
-    2>&1 | grep -v '^==' > mm-test9.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' > mm-test9.err
 
 tmpfiles="$tmpfiles mm-test9.ok"
 cat << EOF > mm-test9.ok