Avoid test suite failures on Cygwin-hosted mingw.

18 files changed, 44 insertions, 21 deletions

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 4aaee9e..8be2cce 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,24 @@
+2007-10-19  Bruno Haible  <bruno@clisp.org>
+
+	Avoid test suite failures on Cygwin-hosted mingw.
+	* msginit-1: Convert CR/LF to LF after applying SED or GREP.
+	* msginit-2: Likewise.
+	* msgmerge-2: Likewise.
+	* msgmerge-9: Likewise.
+	* xgettext-3: Likewise.
+	* xgettext-4: Likewise.
+	* xgettext-5: Likewise.
+	* xgettext-8: Likewise.
+	* xgettext-csharp-2: Likewise.
+	* xgettext-perl-2: Likewise.
+	* xgettext-perl-3: Likewise.
+	* xgettext-python-1: Likewise.
+	* xgettext-csharp-3: Likewise.
+	* xgettext-java-2: Likewise.
+	* xgettext-python-3: Likewise.
+	* xgettext-stringtable-1: Likewise.
+	* xgettext-tcl-1: Likewise.
+
 2007-10-09  Bruno Haible  <bruno@clisp.org>
 
 	* xgettext-c-17: New file.
diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1
index 1597d2a..1f8de53 100755
--- a/gettext-tools/tests/msginit-1
+++ b/gettext-tools/tests/msginit-1
@@ -43,7 +43,7 @@ tmpfiles="$tmpfiles mi-test1.tmp mi-test1.out mi-test1.err"
 : ${MSGINIT=msginit}
 ${MSGINIT} -i mi-test1.pot -l ga_IE --no-translator -o mi-test1.tmp 2>mi-test1.err
 test $? = 0 || { cat mi-test1.err 1>&2; rm -fr $tmpfiles; exit 1; }
-sed -e '1,15d' < mi-test1.tmp > mi-test1.out
+sed -e '1,15d' < mi-test1.tmp | tr -d '\r' > mi-test1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mi-test1.ok"
diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2
index 4fb7b83..52eaf8e 100755
--- a/gettext-tools/tests/msginit-2
+++ b/gettext-tools/tests/msginit-2
@@ -67,7 +67,7 @@ tmpfiles="$tmpfiles mi-test2.tmp mi-test2.out mi-test2.err"
 : ${MSGINIT=msginit}
 ${MSGINIT} -i mi-test2.pot -l ga_IE --no-translator -o mi-test2.tmp 2>mi-test2.err
 test $? = 0 || { cat mi-test2.err 1>&2; rm -fr $tmpfiles; exit 1; }
-sed -e '1,15d' < mi-test2.tmp > mi-test2.out
+sed -e '1,15d' < mi-test2.tmp | tr -d '\r' > mi-test2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mi-test2.ok"
diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2
index 07a4edd..7e7a926 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|' > mm-test2.out
+  2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' | 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 ffa75ed..744c389 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|' > mm-test9.err
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' | tr -d '\r' > mm-test9.err
 
 tmpfiles="$tmpfiles mm-test9.ok"
 cat << EOF > mm-test9.ok
diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3
index b2dcef1..c6c59f7 100755
--- a/gettext-tools/tests/xgettext-3
+++ b/gettext-tools/tests/xgettext-3
@@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-test3.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --no-location -k_ xg-test3.in.c 2>/dev/null \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-test3.po
+  | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-test3.po
 
 tmpfiles="$tmpfiles xg-test3.ok"
 cat <<EOF > xg-test3.ok
diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4
index e6f7c92..ab85af8 100755
--- a/gettext-tools/tests/xgettext-4
+++ b/gettext-tools/tests/xgettext-4
@@ -14,7 +14,7 @@ tmpfiles="$tmpfiles xg-test4.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --foreign-user --no-location -k_ xg-test4.in.c \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-test4.po
+  | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-test4.po
 
 tmpfiles="$tmpfiles xg-test4.ok"
 cat <<EOF > xg-test4.ok
diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5
index 71f7458..d7fce82 100755
--- a/gettext-tools/tests/xgettext-5
+++ b/gettext-tools/tests/xgettext-5
@@ -14,11 +14,13 @@ void foo (int option)
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test5.po"
+tmpfiles="$tmpfiles xg-test5.tmp xg-test5.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --no-location -k_ -o xg-test5.po xg-test5.c 2>/dev/null
 test $? = 1 || { rm -fr $tmpfiles; exit 1; }
-${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.po xg-test5.c
+${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-test5.tmp > xg-test5.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test5.pot"
diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8
index f39a7b4..e3005bc 100755
--- a/gettext-tools/tests/xgettext-8
+++ b/gettext-tools/tests/xgettext-8
@@ -40,7 +40,7 @@ ${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test8.pot"
-sed -e '/POT-Creation-Date/d' < xg-test8.po > xg-test8.pot
+sed -e '/POT-Creation-Date/d' < xg-test8.po | tr -d '\r' > xg-test8.pot
 
 tmpfiles="$tmpfiles xg-test8.ok"
 cat <<\EOF > xg-test8.ok
diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2
index b0b6e5a..260cf8b 100755
--- a/gettext-tools/tests/xgettext-csharp-2
+++ b/gettext-tools/tests/xgettext-csharp-2
@@ -29,7 +29,7 @@ tmpfiles="$tmpfiles xg-cs-2.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --add-location -c --from-code=UTF-8 xg-cs-2.cs \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-cs-2.po
+  | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-cs-2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-cs-2.ok"
diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3
index f98c75d..74050d6 100755
--- a/gettext-tools/tests/xgettext-csharp-3
+++ b/gettext-tools/tests/xgettext-csharp-3
@@ -55,7 +55,7 @@ tmpfiles="$tmpfiles xg-cs-3.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --add-location -c -kMyGetString:2 xg-cs-3.cs 2>/dev/null \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-cs-3.po
+  | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-cs-3.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-cs-3.ok"
diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2
index fdd344a..689e728 100755
--- a/gettext-tools/tests/xgettext-java-2
+++ b/gettext-tools/tests/xgettext-java-2
@@ -62,7 +62,7 @@ tmpfiles="$tmpfiles xg-j-2.tmp xg-j-2.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-j-2.tmp > xg-j-2.pot
+grep -v 'POT-Creation-Date' < xg-j-2.tmp | tr -d '\r' > xg-j-2.pot
 
 tmpfiles="$tmpfiles xg-j-2.ok"
 cat <<\EOF > xg-j-2.ok
diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2
index d9a76bf..ce1e28f 100755
--- a/gettext-tools/tests/xgettext-perl-2
+++ b/gettext-tools/tests/xgettext-perl-2
@@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-pl-2.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --from-code=ISO-8859-1 xg-pl-2.pl \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-pl-2.po
+  | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-pl-2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-pl-2.ok"
diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3
index c05cb56..8279751 100755
--- a/gettext-tools/tests/xgettext-perl-3
+++ b/gettext-tools/tests/xgettext-perl-3
@@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-pl-3.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --from-code=UTF-8 xg-pl-3.pl \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-pl-3.po
+  | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-pl-3.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-pl-3.ok"
diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index 36d6bf0..aace2a1 100755
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-py-1.err xg-py-1.tmp xg-py-1.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-py-1.tmp xg-py-1.py 2>xg-py-1.err
 test $? = 0 || { cat xg-py-1.err; rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-py-1.tmp > xg-py-1.pot
+grep -v 'POT-Creation-Date' < xg-py-1.tmp | tr -d '\r' > xg-py-1.pot
 
 tmpfiles="$tmpfiles xg-py-1.ok"
 cat <<\EOF > xg-py-1.ok
diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
index e50b187..a81a7b3 100755
--- a/gettext-tools/tests/xgettext-python-3
+++ b/gettext-tools/tests/xgettext-python-3
@@ -54,7 +54,7 @@ test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=euc-jp \
   -o xg-py-3a.tmp xg-py-3a.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-py-3a.tmp > xg-py-3a.pot
+grep -v 'POT-Creation-Date' < xg-py-3a.tmp | tr -d '\r' > xg-py-3a.pot
 
 : ${DIFF=diff}
 ${DIFF} xg-py-3.ok xg-py-3a.pot
@@ -66,7 +66,7 @@ tmpfiles="$tmpfiles xg-py-3b.tmp xg-py-3b.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
   -o xg-py-3b.tmp xg-py-3b.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-py-3b.tmp > xg-py-3b.pot
+grep -v 'POT-Creation-Date' < xg-py-3b.tmp | tr -d '\r' > xg-py-3b.pot
 
 ${DIFF} xg-py-3.ok xg-py-3b.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -78,7 +78,7 @@ tmpfiles="$tmpfiles xg-py-3c.tmp xg-py-3c.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=iso-8859-1 \
   -o xg-py-3c.tmp xg-py-3b.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-py-3c.tmp > xg-py-3c.pot
+grep -v 'POT-Creation-Date' < xg-py-3c.tmp | tr -d '\r' > xg-py-3c.pot
 
 ${DIFF} xg-py-3.ok xg-py-3c.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -98,7 +98,7 @@ tmpfiles="$tmpfiles xg-py-3d.tmp xg-py-3d.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: \
   -o xg-py-3d.tmp xg-py-3d.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-py-3d.tmp > xg-py-3d.pot
+grep -v 'POT-Creation-Date' < xg-py-3d.tmp | tr -d '\r' > xg-py-3d.pot
 
 tmpfiles="$tmpfiles xg-py-3d.ok"
 cat <<\EOF > xg-py-3d.ok
diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index a136c43..35a455c 100755
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -27,7 +27,7 @@ tmpfiles="$tmpfiles xg-st-1.tmp xg-st-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-st-1.tmp xg-st-1.strings
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-st-1.tmp > xg-st-1.po
+grep -v 'POT-Creation-Date' < xg-st-1.tmp | tr -d '\r' > xg-st-1.po
 
 tmpfiles="$tmpfiles xg-st-1.ok"
 cat <<\EOF > xg-st-1.ok
diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1
index 5424cb6..6d3f924 100755
--- a/gettext-tools/tests/xgettext-tcl-1
+++ b/gettext-tools/tests/xgettext-tcl-1
@@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-t-1.err xg-t-1.tmp xg-t-1.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-1.tmp xg-t-1.tcl 2>xg-t-1.err
 test $? = 0 || { cat xg-t-1.err; rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-t-1.tmp > xg-t-1.pot
+grep -v 'POT-Creation-Date' < xg-t-1.tmp | tr -d '\r' > xg-t-1.pot
 
 tmpfiles="$tmpfiles xg-t-1.ok"
 cat <<\EOF > xg-t-1.ok