7173494: some jdk tests are not run in test/Makefile
Reviewed-by: chegar, mchung, mduigou, iris
--- a/jdk/make/jprt.properties Tue Oct 09 12:50:52 2012 +0100
+++ b/jdk/make/jprt.properties Tue Oct 09 13:28:32 2012 +0100
@@ -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= \
--- a/jdk/test/Makefile Tue Oct 09 12:50:52 2012 +0100
+++ b/jdk/test/Makefile Tue Oct 09 13:28:32 2012 +0100
@@ -477,25 +477,21 @@
# Stable agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_lang
JDK_DEFAULT_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 agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_math
JDK_DEFAULT_TARGETS += jdk_math
@@ -503,52 +499,41 @@
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_misc
-JDK_DEFAULT_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_DEFAULT_TARGETS += jdk_other
+jdk_other: $(call TestDirs, \
+ demo/jvmti demo/zipfs sample \
+ javax/naming com/sun/jndi \
+ javax/script \
+ javax/sql \
+ javax/smartcardio \
+ 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 agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_net
JDK_DEFAULT_TARGETS += jdk_net
-jdk_net: $(call TestDirs, com/sun/net java/net sun/net)
- $(call RunAgentvmBatch)
-
-# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_nio1
-JDK_DEFAULT_TARGETS += jdk_nio1
-jdk_nio1: $(call TestDirs, java/nio/file)
+jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net)
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_nio2
-JDK_DEFAULT_TARGETS += jdk_nio2
-jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
- java/nio/channels java/nio/MappedByteBuffer sun/nio/ch)
+jdk_nio: $(call TestDirs, java/nio sun/nio com/oracle/nio)
$(call SharedLibraryPermissions,java/nio/channels)
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
-JDK_ALL_TARGETS += jdk_nio3
-JDK_DEFAULT_TARGETS += jdk_nio3
-jdk_nio3: $(call TestDirs, java/nio/charset sun/nio/cs)
- $(call RunAgentvmBatch)
-
-# All nio tests
-jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
- @$(SummaryInfo)
-
-# Stable agentvm testruns (minus items from PROBLEM_LIST)
jdk_sctp: $(call TestDirs, com/sun/nio/sctp)
$(call RunAgentvmBatch)
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm 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 agentvm testruns (minus items from PROBLEM_LIST)
@@ -566,7 +551,7 @@
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)
+ com/oracle/security)
$(call SharedLibraryPermissions,sun/security)
$(call RunAgentvmBatch)
@@ -593,23 +578,17 @@
$(call RunAgentvmBatch)
# Stable agentvm 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 agentvm 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)
$(call SharedLibraryPermissions,tools/launcher)
$(call RunAgentvmBatch)
-# All tools tests
-jdk_tools: jdk_tools1 jdk_tools2
- @$(SummaryInfo)
-
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
ifdef OPENJDK
--- a/jdk/test/ProblemList.txt Tue Oct 09 12:50:52 2012 +0100
+++ b/jdk/test/ProblemList.txt Tue Oct 09 13:28:32 2012 +0100
@@ -147,6 +147,10 @@
# jdk_management
+############################################################################
+
+# jdk_jmx
+
# 6959636
javax/management/loading/LibraryLoader/LibraryLoaderTest.java windows-all
@@ -162,7 +166,7 @@
############################################################################
-# jdk_misc
+# jdk_other
# 6988950
demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java generic-all
@@ -324,6 +328,7 @@
# 7196199
java/text/Bidi/Bug6665028.java generic-all
+
############################################################################
# jdk_tools
@@ -331,6 +336,24 @@
# 6461635
com/sun/tools/attach/BasicTests.sh generic-all
+# 7172176
+sun/tools/jconsole/ResourceCheckTest.sh generic-all
+sun/tools/jconsole/ImmutableResourceTest.sh generic-all
+
+# 7132203
+sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
+
+# Tests take too long, see 7143279
+tools/pack200/CommandLineTests.java generic-all
+tools/pack200/Pack200Test.java generic-all
+
+# 7150569
+tools/launcher/UnicodeTest.java macosx-all
+
+############################################################################
+
+# jdk_jdi
+
# Filed 6952105
com/sun/jdi/SuspendThreadTest.java generic-all
@@ -346,20 +369,6 @@
# Filed 6402201
com/sun/jdi/ProcessAttachTest.sh generic-all
-# Filed 7172176
-sun/tools/jconsole/ResourceCheckTest.sh generic-all
-sun/tools/jconsole/ImmutableResourceTest.sh generic-all
-
-# 7132203
-sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
-
-# Tests take too long, see 7143279
-tools/pack200/CommandLineTests.java generic-all
-tools/pack200/Pack200Test.java generic-all
-
-# 7150569
-tools/launcher/UnicodeTest.java macosx-all
-
############################################################################
# jdk_util