# HG changeset patch
# User andrew
# Date 1335964535 -3600
# Node ID e7886f5ad6cc837092386fa513e670d4a770456c
# Parent  3a0fd3cc84a0843b90af00ce58d492ed075b4261# Parent  9108e3c2f07ffa218641d93893ac9928e95d213a
Merge

diff -r 3a0fd3cc84a0 -r e7886f5ad6cc .hgtags
--- a/.hgtags	Wed Feb 15 17:07:58 2012 +0000
+++ b/.hgtags	Wed May 02 14:15:35 2012 +0100
@@ -146,6 +146,9 @@
 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
 a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint
+e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02
+becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03
+d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04
 25457f672756f16fed69a172c602fd9aca087413 jdk7u4-b200
 bcc37b8ac1b07b74516bbd97183e84b7eb224d8e jdk7u4-b04
 870fd5101f66e4ec81ae0491166efb64d9b65155 jdk7u4-b02
@@ -157,3 +160,5 @@
 27dc5251e6813a4c13665e702059788bb5e49ff4 jdk7u4-b227
 2455c661d0d753c8aa578acf6ac8f15fff70736d jdk7u4-b09
 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10
+1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11
+e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12
diff -r 3a0fd3cc84a0 -r e7886f5ad6cc make/jprt.properties
--- a/make/jprt.properties	Wed Feb 15 17:07:58 2012 +0000
+++ b/make/jprt.properties	Wed May 02 14:15:35 2012 +0100
@@ -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=					\