summaryrefslogtreecommitdiffstats
path: root/gnulib-local
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-05-09 19:43:06 +0200
committerBruno Haible <bruno@clisp.org>2010-05-09 20:54:28 +0200
commit81eaafa6e7ec0c139f401270327e0b428a08119e (patch)
treec18880330d493e3ec8f4c71ed21640c216701d53 /gnulib-local
parent711439964d3657f025429984fd1b0801c801d229 (diff)
downloadexternal_gettext-81eaafa6e7ec0c139f401270327e0b428a08119e.zip
external_gettext-81eaafa6e7ec0c139f401270327e0b428a08119e.tar.gz
external_gettext-81eaafa6e7ec0c139f401270327e0b428a08119e.tar.bz2
Avoid test suite failure on mingw.
Diffstat (limited to 'gnulib-local')
-rw-r--r--gnulib-local/ChangeLog5
-rwxr-xr-xgnulib-local/tests/test-term-ostream-xterm5
2 files changed, 8 insertions, 2 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index ce80668..f0c292e 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,5 +1,10 @@
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.
* modules/gettext-tools-misc (AM_CPPFLAGS): Augment by
GETTEXTLIB_EXPORTS_FLAGS.
diff --git a/gnulib-local/tests/test-term-ostream-xterm b/gnulib-local/tests/test-term-ostream-xterm
index 6f080c1..e4e1efb 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"