Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Sat, 28 Jan 2012 20:36:29 -0800
changeset 11620 a873029a6345
parent 11619 6583f39d8dff (diff)
parent 11616 7d3720d8c595 (current diff)
child 11621 b832ef83f076
Merge
hotspot/src/os/bsd/vm/decoder_bsd.cpp file | annotate | diff | comparison | revisions
jdk/test/java/io/File/BlockIsDirectory.java file | annotate | diff | comparison | revisions 
--- a/make/jprt.properties	Wed Jul 05 18:01:24 2017 +0200
+++ b/make/jprt.properties	Sat Jan 28 20:36:29 2012 -0800
@@ -63,19 +63,33 @@
 
 # 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=langtools_jtreg},        \
+    ${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_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=    					\
@@ -85,19 +99,13 @@
 
 # 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=					\
jdk-sandbox