From a2cb0c30291398b4446e84a319b9781e49692918 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 24 Jan 2012 09:09:08 +0000
Subject: [PATCH] 7132204: Default testset in JPRT should not run all tests

Reviewed-by: ohair
---
 jdk/make/jprt.properties | 36 ++++++++++++++++++++++--------------
 jdk/test/ProblemList.txt | 12 +++++++++---
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties
index 9fb29299805..9b4f1880369 100644
--- a/jdk/make/jprt.properties
+++ b/jdk/make/jprt.properties
@@ -62,18 +62,32 @@ jprt.vm.default.test.targets=					\
 
 # 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_math}
+
+# Default vm test targets (testset=core)
+jprt.vm.core.test.targets=                                      \
+    ${jprt.vm.default.test.targets}
+
+# 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_util}
+    ${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=                                       \
@@ -83,19 +97,13 @@ jprt.vm.all.test.targets=                                       \
 
 # All jdk test targets (testset=all)
 jprt.make.rule.all.test.targets=    				\
-    ${jprt.make.rule.default.test.targets}, 			\
+    ${jprt.make.rule.core.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_sound},              \
-    ${jprt.my.test.target.set:TESTNAME=jdk_swing},              \
-    ${jprt.my.test.target.set:TESTNAME=jdk_tools1},             \
-    ${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=					\
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 2f4d91ee176..9eaacd91547 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -284,6 +284,9 @@ sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh       generic-all
 # Windows X64, java.lang.IllegalStateException
 javax/management/monitor/AttributeArbitraryDataTypeTest.java    generic-all
 
+# 7132199
+sun/management/jmxremote/bootstrap/JvmstatCountersTest.java	generic-all
+
 ############################################################################
 
 # jdk_math
@@ -476,6 +479,9 @@ java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFac
 java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java generic-all
 java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java generic-all
 
+# 7132247
+java/rmi/registry/readTest/readTest.sh				windows-all
+
 ############################################################################
 
 # jdk_security
@@ -575,13 +581,13 @@ 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
 
-# Filed 7027061
-java/util/Locale/Bug6989440.java                                windows-all
-
 # Filed 6933803
 java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java  generic-all