Fix to avoid test failure with fr_FR locale on MacOS X.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 46e03a290322906534a778640e76afd8594f6bf1..6e953da3d7839bb986b82797235e5125c460d556 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-23  Bruno Haible  <bruno@clisp.org>
+
+       * lang-java: On newer Darwin systems, set the System.out encoding to
+       UTF-8, not ISO-8859-1.
+
 2005-02-13  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (TESTS_ENVIRONMENT): Define also the environment variable

diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index a9eb2bac847da595a59a4fb6719c1cb25ad6f699..68ece1976cb9b10a3e3f869e823e99dbb55173f7 100755 (executable)
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -27,7 +27,7 @@ public class Program {
     Locale.setDefault(new Locale("fr","FR"));
 EOF
 case "$host_os" in
-  darwin*)
+  darwin[56]*)
 cat <<\EOF >> Program.java
     // Some systems (like MacOS X) don't set System.out's character encoding
     // to ISO-8859-1, which is what we need for comparison purposes.
@@ -36,6 +36,17 @@ cat <<\EOF >> Program.java
                                     true, "ISO-8859-1"));
     } catch (UnsupportedEncodingException e) {
     }
+EOF
+    ;;
+  darwin*)
+cat <<\EOF >> Program.java
+    // Some systems (like MacOS X) don't set System.out's character encoding
+    // to UTF-8, which is what we need for comparison purposes.
+    try {
+      System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out),
+                                    true, "UTF-8"));
+    } catch (UnsupportedEncodingException e) {
+    }
 EOF
     ;;
 esac