Tue, 07 Feb 2012 10:36:51 -0800
Merge
1.1 --- a/make/jprt.properties Thu Feb 02 09:39:18 2012 -0800 1.2 +++ b/make/jprt.properties Tue Feb 07 10:36:51 2012 -0800 1.3 @@ -63,19 +63,33 @@ 1.4 1.5 # Default jdk test targets (testset=default) 1.6 jprt.make.rule.default.test.targets= \ 1.7 - ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \ 1.8 - ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \ 1.9 + ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \ 1.10 + ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \ 1.11 + ${jprt.my.test.target.set:TESTNAME=jdk_math} 1.12 + 1.13 +# Default vm test targets (testset=core) 1.14 +jprt.vm.core.test.targets= \ 1.15 + ${jprt.vm.default.test.targets} 1.16 + 1.17 +# Core jdk test targets (testset=core) 1.18 +jprt.make.rule.core.test.targets= \ 1.19 + ${jprt.make.rule.default.test.targets}, \ 1.20 + ${jprt.my.test.target.set:TESTNAME=jdk_util}, \ 1.21 ${jprt.my.test.target.set:TESTNAME=jdk_io}, \ 1.22 - ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \ 1.23 - ${jprt.my.test.target.set:TESTNAME=jdk_math}, \ 1.24 - ${jprt.my.test.target.set:TESTNAME=jdk_misc}, \ 1.25 ${jprt.my.test.target.set:TESTNAME=jdk_net}, \ 1.26 ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \ 1.27 ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \ 1.28 ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \ 1.29 ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ 1.30 + ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ 1.31 + ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ 1.32 + ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ 1.33 + ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ 1.34 + ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ 1.35 ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ 1.36 - ${jprt.my.test.target.set:TESTNAME=jdk_util} 1.37 + ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ 1.38 + ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ 1.39 + ${jprt.my.test.target.set:TESTNAME=jdk_misc} 1.40 1.41 # All vm test targets (testset=all) 1.42 jprt.vm.all.test.targets= \ 1.43 @@ -85,19 +99,13 @@ 1.44 1.45 # All jdk test targets (testset=all) 1.46 jprt.make.rule.all.test.targets= \ 1.47 - ${jprt.make.rule.default.test.targets}, \ 1.48 + ${jprt.make.rule.core.test.targets}, \ 1.49 ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \ 1.50 + ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \ 1.51 ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \ 1.52 ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \ 1.53 - ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ 1.54 - ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ 1.55 - ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ 1.56 - ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ 1.57 - ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ 1.58 ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \ 1.59 - ${jprt.my.test.target.set:TESTNAME=jdk_swing}, \ 1.60 - ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ 1.61 - ${jprt.my.test.target.set:TESTNAME=jdk_tools2} 1.62 + ${jprt.my.test.target.set:TESTNAME=jdk_swing} 1.63 1.64 # JCK test targets in test/Makefile (no windows) 1.65 jprt.my.jck.test.target.set= \