changeset 4750:0a3c42211bff

7133488: (cs) java/nio/charset/Charset/NIOCharsetAvailabilityTest.java fails on MacOSX Reviewed-by: alanb
author khazra
date Wed, 08 Feb 2012 10:17:08 +0000
parents bc9c53f4b9c5
children c5db56c299de
files src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java test/ProblemList.txt
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Wed Feb 08 13:08:15 2012 +0800
+++ b/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Wed Feb 08 10:17:08 2012 +0000
@@ -1279,7 +1279,8 @@
         }
         String osName = AccessController.doPrivileged(
             new GetPropertyAction("os.name"));
-        if ("SunOS".equals(osName) || "Linux".equals(osName)) {
+        if ("SunOS".equals(osName) || "Linux".equals(osName)
+               || osName.startsWith("Mac OS")) {
             charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
                     new String[] {
                         "COMPOUND_TEXT",        // JDK historical
--- a/test/ProblemList.txt	Wed Feb 08 13:08:15 2012 +0800
+++ b/test/ProblemList.txt	Wed Feb 08 10:17:08 2012 +0000
@@ -397,9 +397,6 @@
 # 7132677
 java/nio/channels/Selector/OutOfBand.java			macosx-all
 
-# 7133488
-sun/nio/cs/TestCompoundTest.java				macosx-all
-
 ############################################################################
 
 # jdk_rmi