From: Bruno Haible Date: Sat, 6 Oct 2007 14:33:35 +0000 (+0000) Subject: Use 4 possible expected results instead of just one, due to variations in X-Git-Tag: v0.17~147 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab6a92ee7bb847b30ba2487b782238f7051903ac;p=thirdparty%2Fgettext.git Use 4 possible expected results instead of just one, due to variations in the behaviour of TERM=xterm. --- diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index f0663d070..6b4775d99 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,17 @@ +2007-10-06 Bruno Haible + + * tests/test-term-ostream-xterm-r6.out: New file. + * tests/test-term-ostream-xterm-xf86-v32.out: New file. + * tests/test-term-ostream-xterm-basic.out: New file. + * tests/test-term-ostream-xterm-8bit.out: New file. + * tests/test-term-ostream-xterm.out: Remove file. + * tests/test-term-ostream-xterm: Test against 4 possible expected + results. + * modules/term-ostream-tests (Files): Replace + tests/test-term-ostream-xterm.out with + tests/test-term-ostream-xterm-*.out. + * Makefile.am (EXTRA_DIST): Update. + 2007-03-30 Bruno Haible * alloca.in.h: Change prefix of double-inclusion guard macro to _GL_. diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index c40fb6153..52ad6d2ea 100644 --- a/gnulib-local/Makefile.am +++ b/gnulib-local/Makefile.am @@ -318,7 +318,10 @@ tests/test-moo-sub2.oo.c \ tests/test-moo-sub2.oo.h \ tests/test-term-ostream.c \ tests/test-term-ostream-xterm \ -tests/test-term-ostream-xterm.out \ +tests/test-term-ostream-xterm-r6.out \ +tests/test-term-ostream-xterm-xf86-v32.out \ +tests/test-term-ostream-xterm-basic.out \ +tests/test-term-ostream-xterm-8bit.out \ tests/test-term-ostream-xterm-16color.out \ tests/test-term-ostream-xterm-88color.out \ tests/test-term-ostream-xterm-256color.out diff --git a/gnulib-local/modules/term-ostream-tests b/gnulib-local/modules/term-ostream-tests index 06bb1db64..eede772cd 100644 --- a/gnulib-local/modules/term-ostream-tests +++ b/gnulib-local/modules/term-ostream-tests @@ -1,7 +1,10 @@ Files: tests/test-term-ostream.c tests/test-term-ostream-xterm -tests/test-term-ostream-xterm.out +tests/test-term-ostream-xterm-r6.out +tests/test-term-ostream-xterm-xf86-v32.out +tests/test-term-ostream-xterm-basic.out +tests/test-term-ostream-xterm-8bit.out tests/test-term-ostream-xterm-16color.out tests/test-term-ostream-xterm-88color.out tests/test-term-ostream-xterm-256color.out diff --git a/gnulib-local/tests/test-term-ostream-xterm b/gnulib-local/tests/test-term-ostream-xterm index 2b7c7479f..2d4c65689 100755 --- a/gnulib-local/tests/test-term-ostream-xterm +++ b/gnulib-local/tests/test-term-ostream-xterm @@ -6,8 +6,19 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles out" TERM=xterm ./test-term-ostream > out +# There are several variants of the "xterm" terminal description floating +# around, each with a different sgr0 escape sequence. Use "infocmp -l -1 xterm" +# to inspect the escape sequences of xterm on your platform. +# xterm-r6: sgr0=\E[m +# xterm-xf86-v32: sgr0=\E[m\017 +# xterm-basic: sgr0=\E(B\E[m +# xterm-8bit: sgr0=\2330m\E(B + : ${DIFF=diff} -${DIFF} ${srcdir}/test-term-ostream-xterm.out out > /dev/null + ${DIFF} ${srcdir}/test-term-ostream-xterm-r6.out out > /dev/null \ +|| ${DIFF} ${srcdir}/test-term-ostream-xterm-xf86-v32.out out > /dev/null \ +|| ${DIFF} ${srcdir}/test-term-ostream-xterm-basic.out out > /dev/null \ +|| ${DIFF} ${srcdir}/test-term-ostream-xterm-8bit.out out > /dev/null result=$? rm -fr $tmpfiles diff --git a/gnulib-local/tests/test-term-ostream-xterm-8bit.out b/gnulib-local/tests/test-term-ostream-xterm-8bit.out new file mode 100644 index 000000000..671a07f0b --- /dev/null +++ b/gnulib-local/tests/test-term-ostream-xterm-8bit.out @@ -0,0 +1,131 @@ +Colors (foreground/background): + |black |blue |green |cyan |red |magenta|yellow |white |default +black | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +blue | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +green | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +cyan | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +red | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +magenta| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +yellow | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +white | Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m +default| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words ›39;49m| Words + +Colors (hue/saturation): +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m +  ›39;49m + +Weights: +normal, ›1mbold, ›0m(Bdefault + +Postures: +normal, italic, default + +Text decorations: +normal, ›4munderlined, ›24mdefault + diff --git a/gnulib-local/tests/test-term-ostream-xterm.out b/gnulib-local/tests/test-term-ostream-xterm-basic.out similarity index 100% rename from gnulib-local/tests/test-term-ostream-xterm.out rename to gnulib-local/tests/test-term-ostream-xterm-basic.out diff --git a/gnulib-local/tests/test-term-ostream-xterm-r6.out b/gnulib-local/tests/test-term-ostream-xterm-r6.out new file mode 100644 index 000000000..240de8863 --- /dev/null +++ b/gnulib-local/tests/test-term-ostream-xterm-r6.out @@ -0,0 +1,131 @@ +Colors (foreground/background): + |black |blue |green |cyan |red |magenta|yellow |white |default +black | Words | Words | Words | Words | Words | Words | Words | Words | Words +blue | Words | Words | Words | Words | Words | Words | Words | Words | Words +green | Words | Words | Words | Words | Words | Words | Words | Words | Words +cyan | Words | Words | Words | Words | Words | Words | Words | Words | Words +red | Words | Words | Words | Words | Words | Words | Words | Words | Words +magenta| Words | Words | Words | Words | Words | Words | Words | Words | Words +yellow | Words | Words | Words | Words | Words | Words | Words | Words | Words +white | Words | Words | Words | Words | Words | Words | Words | Words | Words +default| Words | Words | Words | Words | Words | Words | Words | Words | Words + +Colors (hue/saturation): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Weights: +normal, bold, default + +Postures: +normal, italic, default + +Text decorations: +normal, underlined, default + diff --git a/gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out b/gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out new file mode 100644 index 000000000..6e7465de1 --- /dev/null +++ b/gnulib-local/tests/test-term-ostream-xterm-xf86-v32.out @@ -0,0 +1,131 @@ +Colors (foreground/background): + |black |blue |green |cyan |red |magenta|yellow |white |default +black | Words | Words | Words | Words | Words | Words | Words | Words | Words  +blue | Words | Words | Words | Words | Words | Words | Words | Words | Words  +green | Words | Words | Words | Words | Words | Words | Words | Words | Words  +cyan | Words | Words | Words | Words | Words | Words | Words | Words | Words  +red | Words | Words | Words | Words | Words | Words | Words | Words | Words  +magenta| Words | Words | Words | Words | Words | Words | Words | Words | Words  +yellow | Words | Words | Words | Words | Words | Words | Words | Words | Words  +white | Words | Words | Words | Words | Words | Words | Words | Words | Words  +default| Words | Words | Words | Words | Words | Words | Words | Words | Words + +Colors (hue/saturation): +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   +   + +Weights: +normal, bold, default + +Postures: +normal, italic, default + +Text decorations: +normal, underlined, default +