libtextstyle: Fix a test failure on MSYS2.

* libtextstyle/gnulib-local/tests/test-term-ostream-xterm-msys2.out: New file.
* libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh: Use it as an
expected test result.
* libtextstyle/gnulib-local/modules/term-ostream-tests (Files): Add it.
* libtextstyle/Makefile.am (EXTRA_DIST): Likewise.

diff --git a/libtextstyle/Makefile.am b/libtextstyle/Makefile.am
index fa144c057b26c602a3e95f1ee92b1e6261832df6..4a363cde107906dbe43113ef519e9442f1ba69e9 100644 (file)
--- a/libtextstyle/Makefile.am
+++ b/libtextstyle/Makefile.am
@@ -175,6 +175,7 @@ EXTRA_DIST = \
   gnulib-local/tests/test-term-ostream-xterm-linux-debian.out \
   gnulib-local/tests/test-term-ostream-xterm-linux-mandriva.out \
   gnulib-local/tests/test-term-ostream-xterm-mingw.out \
+  gnulib-local/tests/test-term-ostream-xterm-msys2.out \
   gnulib-local/tests/test-term-ostream-xterm-netbsd3.out \
   gnulib-local/tests/test-term-ostream-xterm-osf51.out \
   gnulib-local/tests/test-term-ostream-xterm-r6.out \

diff --git a/libtextstyle/gnulib-local/modules/term-ostream-tests b/libtextstyle/gnulib-local/modules/term-ostream-tests
index 691a38041c2f2d56b0d372c585d312ffbd35b469..817c0e9154a9a9af4bae040119acc0256204a1b3 100644 (file)
--- a/libtextstyle/gnulib-local/modules/term-ostream-tests
+++ b/libtextstyle/gnulib-local/modules/term-ostream-tests
@@ -16,6 +16,7 @@ tests/test-term-ostream-xterm-aix51.out
 tests/test-term-ostream-xterm-osf51.out
 tests/test-term-ostream-xterm-irix65.out
 tests/test-term-ostream-xterm-mingw.out
+tests/test-term-ostream-xterm-msys2.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/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-msys2.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-msys2.out
new file mode 100644 (file)
index 0000000..c816aeb
--- /dev/null
+++ b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-msys2.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, bold, default 
+
+Postures:
+normal, italic, default 
+
+Text decorations:
+normal, underlined, default 
+

diff --git a/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
index 9371dc50bb4c5622493a2a22174e8a8452851885..3095bf4938d03cc3c24c1f43c147ae8fffeeb692 100755 (executable)
--- a/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
+++ b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
@@ -33,7 +33,8 @@ LC_ALL=C tr -d '\r' < out1 > out
 || ${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-mingw.out          out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-msys2.out          out > /dev/null
 result=$?
 
 rm -fr $tmpfiles