From: Bruno Haible <bruno@clisp.org>
Date: Mon, 29 Sep 2008 13:30:25 +0000 (+0000)
Subject: Don't produce CR/LFs in the per-message command script.
X-Git-Tag: v0.18~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=702a63cddc8f7f67ad4de39c45f9f9b04b09c45a;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 90782d719..e02c8e002 100644
--- 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 d39c45446..b33a5514f 100755
--- 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 0f46b89ba..7cc3bb5d5 100755
--- 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 e6e4084e3..9ed16d24a 100755
--- 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