tests: Support newer ncurses with italic caps in xterm terminfo

* tests/test-term-ostream-xterm-basic-italic.out: New file.
* tests/test-term-ostream-xterm: Use it as possible test result.
* Makefile.am (EXTRA_DIST): Add new files.
Needed for ncurses >= 5.9-20140906 that defines sitm/ritm in the
xterm-basic terminfo definition.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 2a254050fbdcfc442d80ad5930161b435c5c8bfa..6f031c6b60c5f68bfbc322f30659e9c66508332e 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-15  Daiki Ueno  <ueno@gnu.org>
+
+       * tests/test-term-ostream-xterm-basic-italic.out: New file.
+       * tests/test-term-ostream-xterm: Use it as possible test result.
+       * Makefile.am (EXTRA_DIST): Add new files.
+       Needed for ncurses >= 5.9-20140906 that defines sitm/ritm in the
+       xterm-basic terminfo definition.
+
 2014-07-14  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.2 released.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 166b278d42f29cf7b01e63158da00e4a85de7f29..31bfaaf1e3baf4ecf81f3532326391262698655d 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -315,6 +315,7 @@ 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-basic.out \
+tests/test-term-ostream-xterm-basic-italic.out \
 tests/test-term-ostream-xterm-8bit.out \
 tests/test-term-ostream-xterm-linux-debian.out \
 tests/test-term-ostream-xterm-linux-mandriva.out \

diff --git a/gnulib-local/tests/test-term-ostream-xterm b/gnulib-local/tests/test-term-ostream-xterm
index e4e1efb802261489a5aa825c4cd31643fdf4859d..71dc6eb8c707219a0d62812e97f913f0b092dfe6 100755 (executable)
--- a/gnulib-local/tests/test-term-ostream-xterm
+++ b/gnulib-local/tests/test-term-ostream-xterm
@@ -22,6 +22,7 @@ LC_ALL=C tr -d '\r' < out1 > out
    ${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-basic-italic.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 --git a/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out b/gnulib-local/tests/test-term-ostream-xterm-basic-italic.out
new file mode 100644 (file)
index 0000000..4d74f8a
--- /dev/null
+++ b/gnulib-local/tests/test-term-ostream-xterm-basic-italic.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(B\e[mdefault 
+
+Postures:
+normal, \e[3mitalic, \e[23mdefault 
+
+Text decorations:
+normal, \e[4munderlined, \e[24mdefault 
+