Don't produce CR/LFs in the per-message command script.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 90782d719240fe6f0ea506868df62d50785901df..e02c8e00278b3c8ade136f2f4f4d406c18fe2272 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-29  Bruno Haible  <bruno@clisp.org>
+
+       Avoid test suite failures on mingw.
+       * msgexec-1: Don't produce CR/LFs in the per-message command script.
+       * msgexec-3: Likewise.
+       * msgexec-4: Likewise.
+
 2008-09-28  Bruno Haible  <bruno@clisp.org>
 
        Avoid test suite failures on mingw.

diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1
index d39c4544641c7ce91b06d988afa8da525c334f02..b33a5514ff0f5c5ffdbf078d70c33a49d7a13882 100755 (executable)
--- a/gettext-tools/tests/msgexec-1
+++ b/gettext-tools/tests/msgexec-1
@@ -60,13 +60,13 @@ EOF
 tmpfiles="$tmpfiles mex-test1.sh"
 cat <<\EOF > mex-test1.sh
 #! /bin/sh
-echo "========================= $MSGEXEC_LOCATION ========================="
+echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
 cat <<MEOF
 $MSGEXEC_MSGID
 ---
 MEOF
 cat
-echo
+echo | LC_ALL=C tr -d '\r'
 exit 0
 EOF
 chmod a+x mex-test1.sh

diff --git a/gettext-tools/tests/msgexec-3 b/gettext-tools/tests/msgexec-3
index 0f46b89bad8c7ba33d0f878321972ab7f82f115d..7cc3bb5d5f40ee96b1c6c20f497195f51761ad4e 100755 (executable)
--- a/gettext-tools/tests/msgexec-3
+++ b/gettext-tools/tests/msgexec-3
@@ -35,13 +35,13 @@ EOF
 tmpfiles="$tmpfiles mex-test3.sh"
 cat <<\EOF > mex-test3.sh
 #! /bin/sh
-echo "========================= $MSGEXEC_LOCATION ========================="
+echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
 cat <<MEOF
 $MSGEXEC_MSGID
 ---
 MEOF
 cat
-echo
+echo | LC_ALL=C tr -d '\r'
 exit 0
 EOF
 chmod a+x mex-test3.sh

diff --git a/gettext-tools/tests/msgexec-4 b/gettext-tools/tests/msgexec-4
index e6e4084e34917abfce072ca9a0213c8d21ecd7c1..9ed16d24aff4da32ffa5dbc3819f539185b6e6fc 100755 (executable)
--- a/gettext-tools/tests/msgexec-4
+++ b/gettext-tools/tests/msgexec-4
@@ -54,16 +54,16 @@ EOF
 tmpfiles="$tmpfiles mex-test4.sh"
 cat <<\EOF > mex-test4.sh
 #! /bin/sh
-echo "========================= $MSGEXEC_LOCATION ========================="
+echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r'
 if test -n "${MSGEXEC_MSGCTXT+set}"; then
-  echo "context: $MSGEXEC_MSGCTXT"
+  echo "context: $MSGEXEC_MSGCTXT" | LC_ALL=C tr -d '\r'
 fi
 cat <<MEOF
 $MSGEXEC_MSGID
 ---
 MEOF
 cat
-echo
+echo | LC_ALL=C tr -d '\r'
 exit 0
 EOF
 chmod a+x mex-test4.sh