tests: Avoid sed error on Mac OS X when dealing with binary input

Reported by Ramsey Dow in:
<http://lists.gnu.org/archive/html/bug-gettext/2014-07/msg00002.html>.
* msgmerge-compendium-6: Run sed with LC_ALL=C, to avoid 'illegal
byte sequence' error on Mac OS X.
* format-sh-1: Likewise.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 07fc0f861b787c3a1ad7ce5915fb628a545e530e..418612103322e23075cafc7f3656e7e0185a484b 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-12  Daiki Ueno  <ueno@gnu.org>
+
+       tests: Avoid sed error on Mac OS X when dealing with binary input
+       Reported by Ramsey Dow in:
+       <http://lists.gnu.org/archive/html/bug-gettext/2014-07/msg00002.html>.
+       * msgmerge-compendium-6: Run sed with LC_ALL=C, to avoid 'illegal
+       byte sequence' error on Mac OS X.
+       * format-sh-1: Likewise.
+
 2014-10-10  Daiki Ueno  <ueno@gnu.org>
 
        tests: Add test for Debian bug#764580

diff --git a/gettext-tools/tests/format-sh-1 b/gettext-tools/tests/format-sh-1
index 8a8a68d84fd5450001d9a59a7466c09f89261ec4..e274a7b8314ddd54b70d9c902c978b0c42eb4ce7 100755 (executable)
--- a/gettext-tools/tests/format-sh-1
+++ b/gettext-tools/tests/format-sh-1
@@ -37,7 +37,7 @@ n=0
 while read comment; do
   read string
   n=`expr $n + 1`
-  sed -e 's,\$,\\$,g' <<EOF > f-sh-1-$n.in
+  LC_ALL=C sed -e 's,\$,\\$,g' <<EOF > f-sh-1-$n.in
 gettext ${string};
 EOF
   ${XGETTEXT} -L Shell --from-code=ISO-8859-1 -o f-sh-1-$n.po f-sh-1-$n.in || exit 1

diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
index 8735acaa7cd4f43480e45244d2d86cbe57254dda..dd0411949bb2bc5d0a497ae0bf31cca6311d65f4 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-6
+++ b/gettext-tools/tests/msgmerge-compendium-6
@@ -66,7 +66,7 @@ LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out || exit 1
 
 : ${MSGCONV=msgconv}
 ${MSGCONV} --to-code=UTF-8 mm-c-6-UUU.out | LC_ALL=C tr -d '\r' > mm-c-6-U.ok
-${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | sed -e 's,EUC-KR,euc-kr,' | LC_ALL=C tr -d '\r' > mm-c-6-E.ok
+${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | LC_ALL=C sed -e 's,EUC-KR,euc-kr,' | LC_ALL=C tr -d '\r' > mm-c-6-E.ok
 
 : ${DIFF=diff}
 ${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { exit 1; }