From: Bruno Haible <bruno@clisp.org>
Date: Tue, 22 Jul 2025 10:40:35 +0000 (+0200)
Subject: tests: Fix a lang-java failure on native Windows.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=101f7026ad27807fa0035e3f733f031aecfe4b98;p=thirdparty%2Fgettext.git

tests: Fix a lang-java failure on native Windows.

* gettext-tools/tests/lang-java: On native Windows, convert newlines in the
output before comparing.
---

diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index d77b905a7..48fd80250 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -214,11 +214,21 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 : ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=".${CLASSPATH_SEPARATOR}../../../gettext-runtime/intl-java/libintl.jar" ${JAVAEXEC} Program 2 ISO-8859-1 > prog.out || Exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=".${CLASSPATH_SEPARATOR}../../../gettext-runtime/intl-java/libintl.jar" ${JAVAEXEC} Program 2 ISO-8859-1 > prog.tmp || Exit 1
+  case "$host_os" in
+    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
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=".${CLASSPATH_SEPARATOR}../../../gettext-runtime/intl-java/libintl.jar" ${JAVAEXEC} Program 2 UTF-8 > prog.out || Exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=".${CLASSPATH_SEPARATOR}../../../gettext-runtime/intl-java/libintl.jar" ${JAVAEXEC} Program 2 UTF-8 > prog.tmp || Exit 1
+  case "$host_os" in
+    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
 fi