From: Bruno Haible <bruno@clisp.org>
Date: Tue, 21 Apr 2009 01:43:01 +0000 (+0200)
Subject: Avoid test failure on mingw.
X-Git-Tag: v0.1~5996
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=5eb3375eba5689cde27f63495eadb1f7707a1276;p=gnulib.git

Avoid test failure on mingw.
---

diff --git a/ChangeLog b/ChangeLog
index e7a2459aa..845cad6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-04-20  Bruno Haible  <bruno@clisp.org>
 
+	Avoid test failure on mingw.
+	* tests/uniwidth/test-uc_width2.sh: Convert newlines in output.
+
+2009-04-20  Bruno Haible  <bruno@clisp.org>
+
 	Avoid compilation error on mingw.
 	* modules/localename-tests (Depends-on): Add locale.
 
diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index 3e0d58a08..484288c9a 100755
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -4,7 +4,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles uc_width.out"
-./test-uc_width2${EXEEXT} > uc_width.out
+./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out
 
 tmpfiles="$tmpfiles uc_width.ok"
 cat > uc_width.ok <<\EOF