From: Bruno Haible <bruno@clisp.org>
Date: Sun, 6 Apr 2008 09:31:10 +0000 (+0200)
Subject: Avoid possible error with non-ASCII bytes in UTF-8 locales.
X-Git-Tag: v0.1~7595
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=a24e310d9deb7aabd723ccea84cb7a7e20cd5cd9;p=gnulib.git

Avoid possible error with non-ASCII bytes in UTF-8 locales.
---

diff --git a/ChangeLog b/ChangeLog
index 1848b05ec..c01061072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-06  Bruno Haible  <bruno@clisp.org>
+
+	Avoid possible error with non-ASCII bytes in UTF-8 locales.
+	* tests/test-fprintf-posix.sh: Use "LC_ALL=C tr" instead of "tr".
+	* tests/test-printf-posix.sh: Likewise.
+	* tests/test-vfprintf-posix.sh: Likewise.
+	* tests/test-vprintf-posix.sh: Likewise.
+	* tests/test-xprintf-posix.sh: Likewise.
+
 2008-04-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* m4/double-slash-root.m4 (gl_DOUBLE_SLASH_ROOT): Fix quoting,
diff --git a/tests/test-fprintf-posix.sh b/tests/test-fprintf-posix.sh
index 18ed2ece4..f9acf1f23 100755
--- a/tests/test-fprintf-posix.sh
+++ b/tests/test-fprintf-posix.sh
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-fprintf-posix.tmp t-fprintf-posix.out"
 ./test-fprintf-posix${EXEEXT} > t-fprintf-posix.tmp || exit 1
-tr -d '\r' < t-fprintf-posix.tmp > t-fprintf-posix.out || exit 1
+LC_ALL=C tr -d '\r' < t-fprintf-posix.tmp > t-fprintf-posix.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} "${srcdir}/test-printf-posix.output" t-fprintf-posix.out
diff --git a/tests/test-printf-posix.sh b/tests/test-printf-posix.sh
index 036dde290..a81234509 100755
--- a/tests/test-printf-posix.sh
+++ b/tests/test-printf-posix.sh
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-printf-posix.tmp t-printf-posix.out"
 ./test-printf-posix${EXEEXT} > t-printf-posix.tmp || exit 1
-tr -d '\r' < t-printf-posix.tmp > t-printf-posix.out || exit 1
+LC_ALL=C tr -d '\r' < t-printf-posix.tmp > t-printf-posix.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} "${srcdir}/test-printf-posix.output" t-printf-posix.out
diff --git a/tests/test-vfprintf-posix.sh b/tests/test-vfprintf-posix.sh
index 7544d6740..74339ba08 100755
--- a/tests/test-vfprintf-posix.sh
+++ b/tests/test-vfprintf-posix.sh
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-vfprintf-posix.tmp t-vfprintf-posix.out"
 ./test-vfprintf-posix${EXEEXT} > t-vfprintf-posix.tmp || exit 1
-tr -d '\r' < t-vfprintf-posix.tmp > t-vfprintf-posix.out || exit 1
+LC_ALL=C tr -d '\r' < t-vfprintf-posix.tmp > t-vfprintf-posix.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} "${srcdir}/test-printf-posix.output" t-vfprintf-posix.out
diff --git a/tests/test-vprintf-posix.sh b/tests/test-vprintf-posix.sh
index 0258d30b7..968a8b2a8 100755
--- a/tests/test-vprintf-posix.sh
+++ b/tests/test-vprintf-posix.sh
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-vprintf-posix.tmp t-vprintf-posix.out"
 ./test-vprintf-posix${EXEEXT} > t-vprintf-posix.tmp || exit 1
-tr -d '\r' < t-vprintf-posix.tmp > t-vprintf-posix.out || exit 1
+LC_ALL=C tr -d '\r' < t-vprintf-posix.tmp > t-vprintf-posix.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} "${srcdir}/test-printf-posix.output" t-vprintf-posix.out
diff --git a/tests/test-xprintf-posix.sh b/tests/test-xprintf-posix.sh
index b9ed7fcf9..0087a9d44 100755
--- a/tests/test-xprintf-posix.sh
+++ b/tests/test-xprintf-posix.sh
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-xprintf-posix.tmp t-xprintf-posix.out"
 ./test-xprintf-posix${EXEEXT} > t-xprintf-posix.tmp || exit 1
-tr -d '\r' < t-xprintf-posix.tmp > t-xprintf-posix.out || exit 1
+LC_ALL=C tr -d '\r' < t-xprintf-posix.tmp > t-xprintf-posix.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} "${srcdir}/test-printf-posix.output" t-xprintf-posix.out
@@ -13,7 +13,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles t-xfprintf-posix.tmp t-xfprintf-posix.out"
 ./test-xfprintf-posix${EXEEXT} > t-xfprintf-posix.tmp || exit 1
-tr -d '\r' < t-xfprintf-posix.tmp > t-xfprintf-posix.out || exit 1
+LC_ALL=C tr -d '\r' < t-xfprintf-posix.tmp > t-xfprintf-posix.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} "${srcdir}/test-printf-posix.output" t-xfprintf-posix.out