tests: Recognize the *-*-windows* config triplets introduced on 2023-06-26.

* gettext-tools/tests/init-env.in: Treat windows* as equivalent to mingw*.
* gettext-tools/tests/intl-7: Likewise.
* gettext-tools/tests/lang-c: Likewise.
* gettext-tools/tests/lang-c++: Likewise.
* gettext-tools/tests/lang-c++-boost: Likewise.
* gettext-tools/tests/lang-c++20: Likewise.
* gettext-tools/tests/lang-c++26: Likewise.
* gettext-tools/tests/lang-d: Likewise.
* gettext-tools/tests/lang-modula2: Likewise.
* gettext-tools/tests/lang-objc: Likewise.
* gettext-tools/tests/msgfilter-8: Likewise.

diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in
index 2690971ca4265ffd31ec4018860e849ad954a1a6..63af1972432db2cfb614b666543ba0d4c866707c 100644 (file)
--- a/gettext-tools/tests/init-env.in
+++ b/gettext-tools/tests/init-env.in
@@ -41,7 +41,7 @@ ARCHIVE_VERSION="@ARCHIVE_VERSION@"
 wabs_srcdir="$abs_srcdir"
 wabs_top_srcdir="$abs_top_srcdir"
 case "$host_os" in
-  mingw*)
+  mingw* | windows*)
     if (cygpath --version) >/dev/null 2>/dev/null; then
       wabs_srcdir=`cygpath -w "$abs_srcdir"`
       wabs_top_srcdir=`cygpath -w "$abs_top_srcdir"`

diff --git a/gettext-tools/tests/intl-7 b/gettext-tools/tests/intl-7
index c1c5722b9f22a51ceba6eb62f3428e107671c7fc..6a6a61945a38c04d7070e9b7ac717a2d09b084aa 100755 (executable)
--- a/gettext-tools/tests/intl-7
+++ b/gettext-tools/tests/intl-7
@@ -6,7 +6,7 @@
 
 # Try to find a writable absolute directory name.
 case "$host_os" in
-  mingw*)
+  mingw* | windows*)
     # On native Windows, it is important that ${ldir} is an absolute directory,
     # so that the test exercises a mix between directories specified as 'char *'
     # and directories specified as 'wchar_t *'. (If we used a relative

diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index b519634e92ad67f63100cfb182b059240ab41865..830472064defda6f45896d547ec44169b038cfde 100755 (executable)
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -131,7 +131,8 @@ if test $LOCALE_FR != none; then
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -143,7 +144,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 2c32faf14464dbc770a70df18d52c468597415e9..aa5233ed0142040527983d9e6fd07302df0a08dc 100755 (executable)
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -151,7 +151,8 @@ if test $LOCALE_FR != none; then
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -163,7 +164,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-c++-boost b/gettext-tools/tests/lang-c++-boost
index 0bc11bd7ec343926e1df8dd8a6f32b4622051e69..973ef73fc6c4c5cfa95931e80d601008877152a3 100755 (executable)
--- a/gettext-tools/tests/lang-c++-boost
+++ b/gettext-tools/tests/lang-c++-boost
@@ -153,7 +153,8 @@ if test $LOCALE_FR != none; then
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -165,7 +166,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-c++20 b/gettext-tools/tests/lang-c++20
index 5c1b896ade2484f9cce565e2e0c3e896a52277ee..07c641d8135a65ac998624a6eee996f6b5dccb0b 100755 (executable)
--- a/gettext-tools/tests/lang-c++20
+++ b/gettext-tools/tests/lang-c++20
@@ -181,7 +181,8 @@ if test $LOCALE_FR != none; then
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -193,7 +194,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-c++26 b/gettext-tools/tests/lang-c++26
index d8eaaca80a283ba17d9dd6ffdd304f8de1a37815..31ac6967a9a035640672c6640b220a96bccca41b 100755 (executable)
--- a/gettext-tools/tests/lang-c++26
+++ b/gettext-tools/tests/lang-c++26
@@ -158,7 +158,8 @@ if test $LOCALE_FR != none; then
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -170,7 +171,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-d b/gettext-tools/tests/lang-d
index 6a609c5f5d10f58d9842edb83b91fae54e900a1f..4f59d37cc40130a649f3546b78d456be98e31114 100644 (file)
--- a/gettext-tools/tests/lang-d
+++ b/gettext-tools/tests/lang-d
@@ -146,7 +146,8 @@ if test $LOCALE_FR != none; then
   LC_ALL=$LOCALE_FR LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -158,7 +159,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LC_ALL=$LOCALE_FR_UTF8 LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-modula2 b/gettext-tools/tests/lang-modula2
index 9fe3ab91c304c4426093b2fe93ebd5d69e007331..79bfdddf3b94feed5df96efd11fcfedd4843464e 100644 (file)
--- a/gettext-tools/tests/lang-modula2
+++ b/gettext-tools/tests/lang-modula2
@@ -165,7 +165,8 @@ if test $LOCALE_FR != none; then
   LC_ALL=$LOCALE_FR LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -177,7 +178,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LC_ALL=$LOCALE_FR_UTF8 LANGUAGE= ./prog 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 3683a13ea5584c79a9ec9bb1a0003ba327b84139..324e67beabe74c7a9ccfb58fa4f2177f6dd870b0 100755 (executable)
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -146,7 +146,8 @@ if test $LOCALE_FR != none; then
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.ok prog.out || Exit 1;;
@@ -158,7 +159,8 @@ if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
     0) case "$host_os" in
-         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         mingw* | windows*)
+           LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
          *) cp prog.tmp prog.out || Exit 1 ;;
        esac
        ${DIFF} prog.oku prog.out || Exit 1;;

diff --git a/gettext-tools/tests/msgfilter-8 b/gettext-tools/tests/msgfilter-8
index 9b665eb31be583c09c20a31bcca0a021bbc0c9b1..2f8851386be2aab88a4198db3336885cd81362e7 100755 (executable)
--- a/gettext-tools/tests/msgfilter-8
+++ b/gettext-tools/tests/msgfilter-8
@@ -77,7 +77,7 @@ EOF
 
 : ${MSGFILTER=msgfilter}
 case "$host_os" in
-  mingw*) CONFIG_SHELL='sh' ;;
+  mingw* | windows*) CONFIG_SHELL='sh' ;;
   *) : ${CONFIG_SHELL=${SHELL-/bin/sh}} ;;
 esac
 LC_ALL=C ${MSGFILTER} --newline -i mfi-test8.po -o mfi-test8.out \