Avoid test suite failure on mingw.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index ce80668bef30bb86ae0d5119df6a799d388b5d8b..f0c292e9bf3f75ba75e7abbc9451935b09cb9e52 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-09  Bruno Haible  <bruno@clisp.org>
+
+       Avoid test suite failure on mingw.
+       * tests/test-term-ostream-xterm: Convert CR/LF to LF before comparing.
+
 2010-05-09  Bruno Haible  <bruno@clisp.org>
 
        Export rpl_optind, rpl_optarg from DLL depending on platform.

diff --git a/gnulib-local/tests/test-term-ostream-xterm b/gnulib-local/tests/test-term-ostream-xterm
index 6f080c19e23a7c00dcb830a4ec5de4837dbf6a0b..e4e1efb802261489a5aa825c4cd31643fdf4859d 100755 (executable)
--- a/gnulib-local/tests/test-term-ostream-xterm
+++ b/gnulib-local/tests/test-term-ostream-xterm
@@ -3,10 +3,11 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles out"
+tmpfiles="$tmpfiles out1 out"
 # The redirection of stderr into a pipe avoids the output of padding bytes
 # (unnecessary NUL bytes after escape sequences) on some systems.
-(TERM=xterm ./test-term-ostream > out) 2>&1 | cat 1>&2
+(TERM=xterm ./test-term-ostream > out1) 2>&1 | cat 1>&2
+LC_ALL=C tr -d '\r' < out1 > out
 
 # There are several variants of the "xterm" terminal description floating
 # around, each with a different sgr0 escape sequence. Use "infocmp -l -1 xterm"