changeset 4967:fe20b8d533d1

7132204: Default testset in JPRT should not run all tests Reviewed-by: ohair
author alanb
date Sat, 04 Feb 2012 15:22:42 +0000
parents 228092b90efb
children 84a38283b2ba
files make/jprt.properties test/ProblemList.txt
diffstat 2 files changed, 42 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Sat Feb 04 15:17:34 2012 +0000
+++ b/make/jprt.properties	Sat Feb 04 15:22:42 2012 +0000
@@ -64,19 +64,32 @@
 
 # Default jdk test targets (testset=default)
 jprt.make.rule.default.test.targets=				\
-    ${jprt.my.test.target.set:TESTNAME=jdk_beans1},             \
-    ${jprt.my.test.target.set:TESTNAME=jdk_io},                 \
     ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
-    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
-    ${jprt.my.test.target.set:TESTNAME=jdk_misc},               \
-    ${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_security1},          \
-    ${jprt.my.test.target.set:TESTNAME=jdk_text},               \
-    ${jprt.my.test.target.set:TESTNAME=jdk_tools1},             \
-    ${jprt.my.test.target.set:TESTNAME=jdk_util}
+    ${jprt.my.test.target.set:TESTNAME=jdk_math}
+
+# Core vm test targets (testset=core)
+jprt.vm.core.test.targets=					\
+    ${jprt.vm.default.test.target}
+
+# Core jdk test targets (testset=core)
+jprt.make.rule.core.test.targets=				\
+    ${jprt.make.rule.default.test.targets},			\
+    ${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_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_text},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_tools1},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_tools2},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_misc}
 
 # All vm test targets (testset=all)
 jprt.vm.all.test.targets=                                       \
@@ -88,15 +101,10 @@
 jprt.make.rule.all.test.targets=    				\
     ${jprt.make.rule.default.test.targets}, 			\
     ${jprt.my.test.target.set:TESTNAME=jdk_awt},                \
+    ${jprt.my.test.target.set:TESTNAME=jdk_beans1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_beans2},             \
     ${jprt.my.test.target.set:TESTNAME=jdk_beans3},             \
-    ${jprt.my.test.target.set:TESTNAME=jdk_management1},        \
-    ${jprt.my.test.target.set:TESTNAME=jdk_management2},        \
-    ${jprt.my.test.target.set:TESTNAME=jdk_rmi},                \
-    ${jprt.my.test.target.set:TESTNAME=jdk_security2},          \
-    ${jprt.my.test.target.set:TESTNAME=jdk_security3},          \
-    ${jprt.my.test.target.set:TESTNAME=jdk_swing},              \
-    ${jprt.my.test.target.set:TESTNAME=jdk_tools2}
+    ${jprt.my.test.target.set:TESTNAME=jdk_swing}
 
 # JCK test targets in test/Makefile (no windows)
 jprt.my.jck.test.target.set=					\
--- a/test/ProblemList.txt	Sat Feb 04 15:17:34 2012 +0000
+++ b/test/ProblemList.txt	Sat Feb 04 15:22:42 2012 +0000
@@ -391,6 +391,15 @@
 java/nio/channels/AsynchronousFileChannel/Lock.java 		macosx-all
 java/nio/channels/FileChannel/Transfer.java 			macosx-all
 
+# 7141822
+java/nio/channels/DatagramChannel/ChangingAddress.java		macosx-all
+
+# 7132677
+java/nio/channels/Selector/OutOfBand.java			macosx-all
+
+# 7133488
+sun/nio/cs/TestCompoundTest.java				macosx-all
+
 ############################################################################
 
 # jdk_rmi
@@ -663,12 +672,18 @@
 # 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
 
 # Filed 6979016
 sun/tools/jconsole/ResourceCheckTest.sh                         generic-all
 
+# 7132203
+sun/jvmstat/monitor/MonitoredVm/CR6672135.java                  generic-all
+
 ############################################################################
 
 # jdk_util