Add expected test results for Debian 4.0.0.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 41d4058fcdf03c77e46aa0308078e7782594203f..7c7a68b6a6f39162f43a7f6780affae11134d230 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -5,11 +5,13 @@
 
 2007-10-27  Bruno Haible  <bruno@clisp.org>
 
-       * tests/test-term-ostream-xterm-new.out: New file.
-       * tests/test-term-ostream-xterm: Use it as possible test result.
-       * modules/term-ostream-tests (Files): Add it.
-       * Makefile.am (EXTRA_DIST): Add it.
-       Needed on Mandriva Linux Corporate Server release 2006.0.
+       * tests/test-term-ostream-xterm-linux-debian.out: New file.
+       * tests/test-term-ostream-xterm-linux-mandriva.out: New file.
+       * tests/test-term-ostream-xterm: Use them as possible test results.
+       * modules/term-ostream-tests (Files): Add the new files.
+       * Makefile.am (EXTRA_DIST): Add the new files.
+       Needed on Mandriva Linux Corporate Server release 2006.0 and
+       Debian 4.0.0.
 
 2007-10-27  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 12096335ae6bc3dbc6d50a5dd12c8aba0cd84529..88632ef0be8cdfd9e2a5b4204514879f1025a781 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -321,9 +321,10 @@ tests/test-term-ostream.c \
 tests/test-term-ostream-xterm \
 tests/test-term-ostream-xterm-r6.out \
 tests/test-term-ostream-xterm-xf86-v32.out \
-tests/test-term-ostream-xterm-new.out \
 tests/test-term-ostream-xterm-basic.out \
 tests/test-term-ostream-xterm-8bit.out \
+tests/test-term-ostream-xterm-linux-debian.out \
+tests/test-term-ostream-xterm-linux-mandriva.out \
 tests/test-term-ostream-xterm-netbsd3.out \
 tests/test-term-ostream-xterm-solaris10.out \
 tests/test-term-ostream-xterm-aix51.out \

diff --git a/gnulib-local/modules/term-ostream-tests b/gnulib-local/modules/term-ostream-tests
index 315f97191cddda04a80edf1d243660b8459b42a2..f99d48c5bda595f5c83be9f125f73d33121a1c2e 100644 (file)
--- a/gnulib-local/modules/term-ostream-tests
+++ b/gnulib-local/modules/term-ostream-tests
@@ -3,9 +3,10 @@ tests/test-term-ostream.c
 tests/test-term-ostream-xterm
 tests/test-term-ostream-xterm-r6.out
 tests/test-term-ostream-xterm-xf86-v32.out
-tests/test-term-ostream-xterm-new.out
 tests/test-term-ostream-xterm-basic.out
 tests/test-term-ostream-xterm-8bit.out
+tests/test-term-ostream-xterm-linux-debian.out
+tests/test-term-ostream-xterm-linux-mandriva.out
 tests/test-term-ostream-xterm-netbsd3.out
 tests/test-term-ostream-xterm-solaris10.out
 tests/test-term-ostream-xterm-aix51.out

diff --git a/gnulib-local/tests/test-term-ostream-xterm b/gnulib-local/tests/test-term-ostream-xterm
index 8c2075b8395bc6235efa31ee929a1856919cdd52..6f080c19e23a7c00dcb830a4ec5de4837dbf6a0b 100755 (executable)
--- a/gnulib-local/tests/test-term-ostream-xterm
+++ b/gnulib-local/tests/test-term-ostream-xterm
@@ -11,24 +11,25 @@ tmpfiles="$tmpfiles 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-new:      sgr0=\E[m\E(B
-#   xterm-basic:    sgr0=\E(B\E[m
-#   xterm-8bit:     sgr0=\2330m\E(B
+#   xterm-r6:             sgr0=\E[m
+#   xterm-xf86-v32:       sgr0=\E[m\017
+#   xterm-linux-mandriva: sgr0=\E[m\E(B
+#   xterm-basic:          sgr0=\E(B\E[m
+#   xterm-8bit:           sgr0=\2330m\E(B
 
 : ${DIFF=diff}
-   ${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-new.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 \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-netbsd3.out   out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-solaris10.out out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-aix51.out     out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-osf51.out     out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-irix65.out    out > /dev/null \
-|| ${DIFF} ${srcdir}/test-term-ostream-xterm-mingw.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 \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-debian.out   out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-mandriva.out out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-netbsd3.out        out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-solaris10.out      out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-aix51.out          out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-osf51.out          out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-irix65.out         out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-mingw.out          out > /dev/null
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gnulib-local/tests/test-term-ostream-xterm-linux-debian.out b/gnulib-local/tests/test-term-ostream-xterm-linux-debian.out
new file mode 100644 (file)
index 0000000..3e1ea67
--- /dev/null
+++ b/gnulib-local/tests/test-term-ostream-xterm-linux-debian.out
@@ -0,0 +1,131 @@
+Colors (foreground/background):
+       |black  |blue   |green  |cyan   |red    |magenta|yellow |white  |default
+black  |\e[30m\e[40m Words \e[39;49m|\e[30m\e[44m Words \e[39;49m|\e[30m\e[42m Words \e[39;49m|\e[30m\e[46m Words \e[39;49m|\e[30m\e[41m Words \e[39;49m|\e[30m\e[45m Words \e[39;49m|\e[30m\e[43m Words \e[39;49m|\e[30m\e[47m Words \e[39;49m|\e[30m Words \e[39;49m
+blue   |\e[34m\e[40m Words \e[39;49m|\e[34m\e[44m Words \e[39;49m|\e[34m\e[42m Words \e[39;49m|\e[34m\e[46m Words \e[39;49m|\e[34m\e[41m Words \e[39;49m|\e[34m\e[45m Words \e[39;49m|\e[34m\e[43m Words \e[39;49m|\e[34m\e[47m Words \e[39;49m|\e[34m Words \e[39;49m
+green  |\e[32m\e[40m Words \e[39;49m|\e[32m\e[44m Words \e[39;49m|\e[32m\e[42m Words \e[39;49m|\e[32m\e[46m Words \e[39;49m|\e[32m\e[41m Words \e[39;49m|\e[32m\e[45m Words \e[39;49m|\e[32m\e[43m Words \e[39;49m|\e[32m\e[47m Words \e[39;49m|\e[32m Words \e[39;49m
+cyan   |\e[36m\e[40m Words \e[39;49m|\e[36m\e[44m Words \e[39;49m|\e[36m\e[42m Words \e[39;49m|\e[36m\e[46m Words \e[39;49m|\e[36m\e[41m Words \e[39;49m|\e[36m\e[45m Words \e[39;49m|\e[36m\e[43m Words \e[39;49m|\e[36m\e[47m Words \e[39;49m|\e[36m Words \e[39;49m
+red    |\e[31m\e[40m Words \e[39;49m|\e[31m\e[44m Words \e[39;49m|\e[31m\e[42m Words \e[39;49m|\e[31m\e[46m Words \e[39;49m|\e[31m\e[41m Words \e[39;49m|\e[31m\e[45m Words \e[39;49m|\e[31m\e[43m Words \e[39;49m|\e[31m\e[47m Words \e[39;49m|\e[31m Words \e[39;49m
+magenta|\e[35m\e[40m Words \e[39;49m|\e[35m\e[44m Words \e[39;49m|\e[35m\e[42m Words \e[39;49m|\e[35m\e[46m Words \e[39;49m|\e[35m\e[41m Words \e[39;49m|\e[35m\e[45m Words \e[39;49m|\e[35m\e[43m Words \e[39;49m|\e[35m\e[47m Words \e[39;49m|\e[35m Words \e[39;49m
+yellow |\e[33m\e[40m Words \e[39;49m|\e[33m\e[44m Words \e[39;49m|\e[33m\e[42m Words \e[39;49m|\e[33m\e[46m Words \e[39;49m|\e[33m\e[41m Words \e[39;49m|\e[33m\e[45m Words \e[39;49m|\e[33m\e[43m Words \e[39;49m|\e[33m\e[47m Words \e[39;49m|\e[33m Words \e[39;49m
+white  |\e[37m\e[40m Words \e[39;49m|\e[37m\e[44m Words \e[39;49m|\e[37m\e[42m Words \e[39;49m|\e[37m\e[46m Words \e[39;49m|\e[37m\e[41m Words \e[39;49m|\e[37m\e[45m Words \e[39;49m|\e[37m\e[43m Words \e[39;49m|\e[37m\e[47m Words \e[39;49m|\e[37m Words \e[39;49m
+default|\e[40m Words \e[39;49m|\e[44m Words \e[39;49m|\e[42m Words \e[39;49m|\e[46m Words \e[39;49m|\e[41m Words \e[39;49m|\e[45m Words \e[39;49m|\e[43m Words \e[39;49m|\e[47m Words \e[39;49m| Words 
+
+Colors (hue/saturation):
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+
+Weights:
+normal, \e[1mbold, \e[0;10mdefault 
+
+Postures:
+normal, italic, default 
+
+Text decorations:
+normal, \e[4munderlined, \e[mdefault 
+