--- old/make/jprt.properties Thu Nov 22 03:16:46 2012 +++ new/make/jprt.properties Thu Nov 22 03:16:45 2012 @@ -77,20 +77,18 @@ ${jprt.my.test.target.set:TESTNAME=jdk_util}, \ ${jprt.my.test.target.set:TESTNAME=jdk_io}, \ ${jprt.my.test.target.set:TESTNAME=jdk_net}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_management}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \ ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_misc} + ${jprt.my.test.target.set:TESTNAME=jdk_other} # All vm test targets (testset=all) jprt.vm.all.test.targets= \ --- old/test/Makefile Thu Nov 22 03:16:49 2012 +++ new/test/Makefile Thu Nov 22 03:16:48 2012 @@ -484,25 +484,21 @@ # Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_lang -jdk_lang: $(call TestDirs, java/lang) +jdk_lang: $(call TestDirs, java/lang sun/invoke sun/misc vm) $(call RunAgentvmBatch) # Stable othervm testruns (minus items from PROBLEM_LIST) # Using agentvm has serious problems with these tests -JDK_ALL_TARGETS += jdk_management1 -jdk_management1: $(call TestDirs, javax/management) +JDK_ALL_TARGETS += jdk_jmx +jdk_jmx: $(call TestDirs, javax/management com/sun/jmx) $(call RunOthervmBatch) # Stable othervm testruns (minus items from PROBLEM_LIST) # Using agentvm has serious problems with these tests -JDK_ALL_TARGETS += jdk_management2 -jdk_management2: $(call TestDirs, com/sun/jmx com/sun/management sun/management) +JDK_ALL_TARGETS += jdk_management +jdk_management: $(call TestDirs, com/sun/management sun/management) $(call RunOthervmBatch) -# All management tests -jdk_management: jdk_management1 jdk_management2 - @$(SummaryInfo) - # Stable samevm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_math jdk_math: $(call TestDirs, java/math) @@ -509,40 +505,33 @@ $(call RunAgentvmBatch) # Stable samevm testruns (minus items from PROBLEM_LIST) -JDK_ALL_TARGETS += jdk_misc -jdk_misc: $(call TestDirs, \ - demo/jvmti demo/zipfs javax/naming javax/script \ - javax/smartcardio com/sun/jndi com/sun/xml \ - com/sun/corba sun/misc) +JDK_ALL_TARGETS += jdk_other +jdk_other: $(call TestDirs, \ + demo/jvmti demo/zipfs javax/naming \ + javax/naming com/sun/jndi \ + javax/script \ + javax/sql \ + javax/smartcardio \ + com/sun/xml \ + javax/xml/ws com/sun/internal/ws \ + com/sun/org/apache/xerces \ + com/sun/corba \ + com/sun/servicetag \ + com/sun/tracing \ + sun/usagetracker) $(call RunAgentvmBatch) # Stable samevm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_net -jdk_net: $(call TestDirs, com/sun/net java/net sun/net) +jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net) $(call RunAgentvmBatch) # Stable samevm testruns (minus items from PROBLEM_LIST) -JDK_ALL_TARGETS += jdk_nio1 -jdk_nio1: $(call TestDirs, java/nio/file) - $(call RunAgentvmBatch) - -# Stable samevm testruns (minus items from PROBLEM_LIST) -JDK_ALL_TARGETS += jdk_nio2 -jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \ - java/nio/channels java/nio/MappedByteBuffer) +jdk_nio: $(call TestDirs, java/nio sun/nio com/oracle/nio) $(call SharedLibraryPermissions,java/nio/channels) $(call RunAgentvmBatch) # Stable samevm testruns (minus items from PROBLEM_LIST) -JDK_ALL_TARGETS += jdk_nio3 -jdk_nio3: $(call TestDirs, sun/nio) - $(call RunAgentvmBatch) - -# All nio tests -jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3 - @$(SummaryInfo) - -# Stable samevm testruns (minus items from PROBLEM_LIST) jdk_sctp: $(call TestDirs, com/sun/nio/sctp) $(call RunAgentvmBatch) @@ -549,7 +538,7 @@ # Stable othervm testruns (minus items from PROBLEM_LIST) # Using samevm has serious problems with these tests JDK_ALL_TARGETS += jdk_rmi -jdk_rmi: $(call TestDirs, java/rmi javax/rmi sun/rmi) +jdk_rmi: $(call TestDirs, java/rmi sun/rmi javax/rmi/ssl) $(call RunOthervmBatch) # Stable samevm testruns (minus items from PROBLEM_LIST) @@ -567,9 +556,9 @@ # Using samevm has serious problems with these tests JDK_ALL_TARGETS += jdk_security3 jdk_security3: $(call TestDirs, com/sun/security lib/security \ - javax/security sun/security \ - com/sun/org/apache/xml/internal/security \ - com/oracle/security/ucrypto) + javax/security sun/security \ + com/sun/org/apache/xml/internal/security \ + com/oracle/security) $(call SharedLibraryPermissions,sun/security) $(call RunAgentvmBatch) @@ -595,23 +584,19 @@ $(call RunAgentvmBatch) # Stable samevm testruns (minus items from PROBLEM_LIST) -JDK_ALL_TARGETS += jdk_tools1 -jdk_tools1: $(call TestDirs, com/sun/jdi) +JDK_ALL_TARGETS += jdk_jdi +jdk_jdi: $(call TestDirs, com/sun/jdi) $(call RunAgentvmBatch) # Stable othervm testruns (minus items from PROBLEM_LIST) # Using samevm has serious problems with these tests -JDK_ALL_TARGETS += jdk_tools2 -jdk_tools2: $(call TestDirs, \ - com/sun/tools sun/jvmstat sun/tools tools vm \ - com/sun/servicetag com/sun/tracing) +JDK_ALL_TARGETS += jdk_tools +jdk_tools: $(call TestDirs, \ + com/sun/tools sun/jvmstat sun/tools tools \ + com/sun/servicetag com/sun/tracing) $(call SharedLibraryPermissions,tools/launcher) $(call RunAgentvmBatch) -# All tools tests -jdk_tools: jdk_tools1 jdk_tools2 - @$(SummaryInfo) - # Stable samevm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_util jdk_util: $(call TestDirs, java/util sun/util) --- old/test/ProblemList.txt Thu Nov 22 03:16:51 2012 +++ new/test/ProblemList.txt Thu Nov 22 03:16:50 2012 @@ -144,18 +144,44 @@ # jdk_management -# Failing, bug was filed: 6959636 -javax/management/loading/LibraryLoader/LibraryLoaderTest.java generic-all - # Access denied messages on windows/mks, filed 6954450 sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh windows-all -# Fails on linux: KO: StringMonitor notification missed or not emitted -javax/management/monitor/NonComparableAttributeValueTest.java generic-all - # Port conflict? Fails with communication error sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh generic-all +# Fails with port already in use +sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh generic-all + +# Fails with port already in use +sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh generic-all + +# Windows run seems to have triggered a hotspot gc error (see 6801625) +com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh generic-all + +# Port already in use +sun/management/jmxremote/bootstrap/LocalManagementTest.sh generic-all + +# Failed to initialize connector (also overflowing jtreg io buffers) +sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh generic-all +sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh generic-all + +# Windows X64, java.lang.IllegalStateException +javax/management/monitor/AttributeArbitraryDataTypeTest.java generic-all + +# 7149181 +sun/management/jmxremote/startstop/JMXStartStopTest.sh generic-all + +############################################################################ + +# jdk_jmx + +# Failing, bug was filed: 6959636 +javax/management/loading/LibraryLoader/LibraryLoaderTest.java generic-all + +# Fails on linux: KO: StringMonitor notification missed or not emitted +javax/management/monitor/NonComparableAttributeValueTest.java generic-all + # Fails on Windows 2000, Test failed for iiop java.lang.NullPointerException # at org.omg.stub.javax.management.remote.rmi._RMIConnectionImpl_Tie._invoke(Unknown Source) # at com.sun.corba.se.impl.protocol.CorbaServerRequestDispatcherImpl.dispatchToServant(CorbaServerRequestDispatcherImpl.java:653) @@ -170,12 +196,6 @@ # Problems with rmi connection, othervm javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java generic-all -# Fails with port already in use -sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh generic-all - -# Fails with port already in use -sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh generic-all - # Windows, connection can't last that long javax/management/eventService/LeaseTest.java generic-all @@ -182,9 +202,6 @@ # Linux othervm, X64, java.lang.Exception: Failed: ratio=102.4027795593753 javax/management/remote/mandatory/notif/ListenerScaleTest.java generic-all -# Windows run seems to have triggered a hotspot gc error (see 6801625) -com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh generic-all - # rmi problem? othervm, java.lang.reflect.UndeclaredThrowableException javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java generic-all @@ -207,19 +224,6 @@ # Windows i586 failure, callback did not complete javax/management/eventService/LeaseManagerDeadlockTest.java windows-all -# Port already in use -sun/management/jmxremote/bootstrap/LocalManagementTest.sh generic-all - -# Failed to initialize connector (also overflowing jtreg io buffers) -sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh generic-all -sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh generic-all - -# Windows X64, java.lang.IllegalStateException -javax/management/monitor/AttributeArbitraryDataTypeTest.java generic-all - -# 7149181 -sun/management/jmxremote/startstop/JMXStartStopTest.sh generic-all - ############################################################################ # jdk_math @@ -226,7 +230,7 @@ ############################################################################ -# jdk_misc +# jdk_other # 6988950 demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java generic-all @@ -466,12 +470,6 @@ # 6461635 com/sun/tools/attach/BasicTests.sh generic-all -# Filed 6952105 -com/sun/jdi/SuspendThreadTest.java generic-all - -# Filed 6987312 -com/sun/jdi/DoubleAgentTest.java generic-all - # Filed 6986875 sun/tools/jps/jps-Vvml.sh generic-all @@ -497,6 +495,16 @@ sun/tools/jinfo/Basic.sh macosx-all ############################################################################ + +# jdk_jdi + +# Filed 6952105 +com/sun/jdi/SuspendThreadTest.java generic-all + +# Filed 6987312 +com/sun/jdi/DoubleAgentTest.java generic-all + +############################################################################ # jdk_util