--- old/src/solaris/native/java/lang/java_props_macosx.c Fri Jan 25 14:35:52 2013 +++ new/src/solaris/native/java/lang/java_props_macosx.c Fri Jan 25 14:35:51 2013 @@ -115,10 +115,6 @@ return true; } -static bool isXDisplayDefined() { - return getenv("DISPLAY") != NULL; -} - PreferredToolkit getPreferredToolkit() { static PreferredToolkit pref = unset; if (pref != unset) return pref; @@ -127,7 +123,6 @@ if (prefFromEnv != unset) return pref = prefFromEnv; if (isInAquaSession()) return pref = CToolkit; - if (isXDisplayDefined()) return pref = XToolkit; return pref = HToolkit; } --- old/test/ProblemList.txt Fri Jan 25 14:35:54 2013 +++ new/test/ProblemList.txt Fri Jan 25 14:35:53 2013 @@ -238,27 +238,6 @@ # 7056489 com/sun/jndi/ldap/ReadTimeoutTest.java generic-all -# 7162111 -demo/jvmti/mtrace/TraceJFrame.java macosx-all -javax/script/CauseExceptionTest.java macosx-all -javax/script/GetInterfaceTest.java macosx-all -javax/script/JavaScriptScopeTest.java macosx-all -javax/script/NullUndefinedVarTest.java macosx-all -javax/script/PluggableContextTest.java macosx-all -javax/script/ProviderTest.sh macosx-all -javax/script/RhinoExceptionTest.java macosx-all -javax/script/StringWriterPrintTest.java macosx-all -javax/script/Test1.java macosx-all -javax/script/Test2.java macosx-all -javax/script/Test3.java macosx-all -javax/script/Test4.java macosx-all -javax/script/Test5.java macosx-all -javax/script/Test6.java macosx-all -javax/script/Test7.java macosx-all -javax/script/Test8.java macosx-all -javax/script/UnescapedBracketRegExTest.java macosx-all -javax/script/VersionTest.java macosx-all - ############################################################################ # jdk_net @@ -301,11 +280,6 @@ # 6962637 java/io/File/MaxPathLength.java windows-all -# 7162111 - these tests need to be updated to run headless -java/io/Serializable/resolveClass/deserializeButton/run.sh macosx-all -java/io/Serializable/serialver/classpath/run.sh macosx-all -java/io/Serializable/serialver/nested/run.sh macosx-all - ############################################################################ # jdk_nio @@ -479,14 +453,6 @@ # 7132203 sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all -# 7162111 -sun/tools/jrunscript/jrunscript-DTest.sh macosx-all -sun/tools/jrunscript/jrunscript-argsTest.sh macosx-all -sun/tools/jrunscript/jrunscript-cpTest.sh macosx-all -sun/tools/jrunscript/jrunscript-eTest.sh macosx-all -sun/tools/jrunscript/jrunscript-fTest.sh macosx-all -sun/tools/jrunscript/jrunscriptTest.sh macosx-all - # 8001118 sun/tools/jcmd/jcmd-f.sh generic-all sun/tools/jcmd/jcmd-help-help.sh generic-all @@ -535,10 +501,6 @@ # Problems on windows, jmap.exe hangs? (these run jmap), fails on Solaris 10 x86 java/util/concurrent/locks/Lock/TimedAcquireLeak.java generic-all -# 7162111 -java/util/ResourceBundle/Control/Bug6530694.java macosx-all -java/util/logging/LoggingDeadlock4.java macosx-all - # 7041639, Solaris DSA keypair generation bug java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all --- old/test/demo/jvmti/mtrace/TraceJFrame.java Fri Jan 25 14:35:57 2013 +++ new/test/demo/jvmti/mtrace/TraceJFrame.java Fri Jan 25 14:35:56 2013 @@ -32,21 +32,26 @@ * @run main TraceJFrame JFrameCreateTime */ -public class TraceJFrame { +import java.awt.GraphicsEnvironment; +public class TraceJFrame { public static void main(String args[]) throws Exception { - DemoRun demo; + if (GraphicsEnvironment.getLocalGraphicsEnvironment().isHeadlessInstance()) { + System.out.println("JFrame test was skipped due to headless mode"); + } else { + DemoRun demo; - /* Run demo that uses JVMTI mtrace agent (no options) */ - demo = new DemoRun("mtrace", "" /* options to mtrace */ ); - demo.runit(args[0]); + /* Run demo that uses JVMTI mtrace agent (no options) */ + demo = new DemoRun("mtrace", "" /* options to mtrace */ ); + demo.runit(args[0]); - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } } } --- old/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java Fri Jan 25 14:36:00 2013 +++ new/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java Fri Jan 25 14:35:59 2013 @@ -26,27 +26,26 @@ * @summary Verify that class loaded outside of application class loader is * correctly resolved during deserialization when read in by custom * readObject() method of a bootstrap class (in this case, - * java.awt.Button). + * java.util.Vector). */ -import java.awt.Button; -import java.awt.event.MouseAdapter; import java.io.*; +import java.util.Vector; public class Foo implements Runnable { - static class Adapter extends MouseAdapter implements Serializable {} + static class TestElement extends Object implements Serializable {} public void run() { try { - Button button = new Button(); - button.addMouseListener(new Adapter()); + Vector container = new Vector(); + container.add(new TestElement()); // iterate to trigger java.lang.reflect code generation for (int i = 0; i < 100; i++) { ByteArrayOutputStream bout = new ByteArrayOutputStream(); ObjectOutputStream oout = new ObjectOutputStream(bout); - oout.writeObject(button); + oout.writeObject(container); oout.close(); ObjectInputStream oin = new ObjectInputStream( new ByteArrayInputStream(bout.toByteArray())); @@ -54,7 +53,7 @@ } } catch (Exception ex) { throw new Error( - "Error occured while (de)serializing Button: " + ex); + "Error occured while (de)serializing container: ", ex); } } } --- old/test/java/io/Serializable/resolveClass/deserializeButton/Test.java Fri Jan 25 14:36:02 2013 +++ new/test/java/io/Serializable/resolveClass/deserializeButton/Test.java Fri Jan 25 14:36:01 2013 @@ -26,7 +26,7 @@ * @summary Verify that class loaded outside of application class loader is * correctly resolved during deserialization when read in by custom * readObject() method of a bootstrap class (in this case, - * java.awt.Button). + * java.util.Vector). */ import java.io.*; --- old/test/java/io/Serializable/resolveClass/deserializeButton/run.sh Fri Jan 25 14:36:04 2013 +++ new/test/java/io/Serializable/resolveClass/deserializeButton/run.sh Fri Jan 25 14:36:03 2013 @@ -26,7 +26,7 @@ # @summary Verify that class loaded outside of application class loader is # correctly resolved during deserialization when read in by custom # readObject() method of a bootstrap class (in this case, -# java.awt.Button). +# java.util.Vector). if [ "${TESTJAVA}" = "" ] then