From: Bruno Haible <bruno@clisp.org>
Date: Mon, 29 Sep 2008 00:34:09 +0000 (+0000)
Subject: Avoid test suite failures on mingw: Normalize the program name better.
X-Git-Tag: v0.18~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85f421953b2c58cb0b3b0175183845b9dc4d4d67;p=thirdparty%2Fgettext.git

Avoid test suite failures on mingw: Normalize the program name better.
---

diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2
index 0b5ad1e7b..bf766e465 100755
--- 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 '^==' | sed -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|' | LC_ALL=C 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 063a64acf..5fc7f968b 100755
--- 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 '^==' | sed -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|' | LC_ALL=C 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 6d1202edf..f5996bea0 100755
--- 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 '^==' | sed -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|' | LC_ALL=C 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 2e78c8fe5..0c7d96add 100755
--- 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 '^==' | sed -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|' | LC_ALL=C 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 d08360e07..cc7c0623e 100755
--- 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 '^==' | sed -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|' | LC_ALL=C 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 ae3aca3d6..4e77327f3 100755
--- 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 '^==' | sed -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|' | LC_ALL=C 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 88d60b3e2..7f857bfa9 100755
--- 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 '^==' | sed -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|' | LC_ALL=C tr -d '\r' > 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 9cb66d2a9..8379b5e1e 100755
--- 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 '^==' | sed -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|' | LC_ALL=C tr -d '\r' > mm-test9.err
 
 tmpfiles="$tmpfiles mm-test9.ok"
 cat << EOF > mm-test9.ok