From: Bruno Haible <bruno@clisp.org>
Date: Sun, 9 May 2010 17:43:06 +0000 (+0200)
Subject: Avoid test suite failure on mingw.
X-Git-Tag: v0.18~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81eaafa6e7ec0c139f401270327e0b428a08119e;p=thirdparty%2Fgettext.git

Avoid test suite failure on mingw.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index ce80668be..f0c292e9b 100644
--- 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 6f080c19e..e4e1efb80 100755
--- 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"