Avoid test failure on mingw.

diff --git a/ChangeLog b/ChangeLog
index e7a2459aaa10051af1708784ae9398b045139957..845cad6e205812f628a909d93dc51af8cb65f6d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index 3e0d58a084007dc250746c4a76d05e50cf004c34..484288c9aac595ce73381a626970f44243d3f347 100755 (executable)
--- 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