From: Bruno Haible <bruno@clisp.org>
Date: Mon, 21 Jul 2025 19:18:33 +0000 (+0200)
Subject: tests: Fix a lang-java failure on native Windows.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef13e879732239993c601687771b5380b250fecf;p=thirdparty%2Fgettext.git

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

* gettext-tools/tests/init-env.in (CLASSPATH_SEPARATOR): New variable.
* gettext-tools/tests/lang-java: Use it instead of hardcoding ':'.
---

diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in
index f8e8e886e..2690971ca 100644
--- a/gettext-tools/tests/init-env.in
+++ b/gettext-tools/tests/init-env.in
@@ -15,6 +15,7 @@ LTLIBINTL="@LTLIBINTL@"
 JAVA_CHOICE="@JAVA_CHOICE@"
 BUILDJAVA="@BUILDJAVA@"
 TESTJAVA="@TESTJAVA@"
+CLASSPATH_SEPARATOR="@CLASSPATH_SEPARATOR@"
 CSHARP_CHOICE="@CSHARP_CHOICE@"
 BUILDCSHARP="@BUILDCSHARP@"
 TESTCSHARP="@TESTCSHARP@"
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index aaebf4681..d77b905a7 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -214,11 +214,11 @@ 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=.:../../../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.out || Exit 1
   ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=.:../../../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.out || Exit 1
   ${DIFF} prog.oku prog.out || Exit 1
 fi