# HG changeset patch
# User lana
# Date 1329354011 28800
# Node ID c5558357265ce0e062538516e1284f341afab133
# Parent  e6f915094dccbba16df6ebeb002e6867392eda40# Parent  c3b758c4e0b3420e4d5c40e066f1294ad8bf0343
Merge

diff -r e6f915094dcc -r c5558357265c make/jprt.properties
--- a/make/jprt.properties	Thu Feb 09 12:55:21 2012 -0800
+++ b/make/jprt.properties	Wed Feb 15 17:00:11 2012 -0800
@@ -66,19 +66,32 @@
 # Default jdk test targets (testset=default)
 jprt.make.rule.default.test.targets=				\
     ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},	\
-    ${jprt.my.test.target.set:TESTNAME=jdk_beans1},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_lang},		\
+    ${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_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_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_util}
+    ${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,17 +101,12 @@
 
 # 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_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=					\