From: Bruno Haible <bruno@clisp.org>
Date: Mon, 23 Dec 2024 21:42:27 +0000 (+0100)
Subject: libtextstyle: Fix a test failure on MSYS2.
X-Git-Tag: v0.24~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f88b788e837f015ec48a077e469cf48b44df3923;p=thirdparty%2Fgettext.git

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 fa144c057..4a363cde1 100644
--- 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 691a38041..817c0e915 100644
--- 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
index 000000000..c816aeb7a
--- /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  | 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/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
index 9371dc50b..3095bf493 100755
--- 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