OpenJDK / jdk-updates / jdk12u
changeset 14109:e49b2b8117e0
Merge
| author | lana |
|---|---|
| date | Tue, 23 Oct 2012 09:40:39 -0700 |
| parents | fa9e37ca6ade 480731d07d2a |
| children | 0e52e8a05d0d |
| files | |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Thu Oct 18 11:07:40 2012 -0700 +++ b/make/jprt.properties Tue Oct 23 09:40:39 2012 -0700 @@ -79,20 +79,18 @@ ${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_nio}, \ ${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_management}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \ ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_misc} + ${jprt.my.test.target.set:TESTNAME=jdk_other} # All vm test targets (testset=all) jprt.vm.all.test.targets= \
--- a/test/Makefile Thu Oct 18 11:07:40 2012 -0700 +++ b/test/Makefile Tue Oct 23 09:40:39 2012 -0700 @@ -58,9 +58,9 @@ jdk_io \ jdk_lang \ jdk_math \ - jdk_misc \ + jdk_other \ jdk_net \ - jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_nio \ jdk_security1 \ jdk_text \ jdk_util @@ -69,12 +69,14 @@ JDK_NONDEFAULT_TEST_LIST = \ jdk_awt \ jdk_beans2 jdk_beans3 \ - jdk_management1 jdk_management2 \ + jdk_management \ + jdk_jmx \ jdk_security2 jdk_security3 \ jdk_rmi \ jdk_sound \ jdk_swing \ - jdk_tools1 jdk_tools2 \ + jdk_tools \ + jdk_jdi \ jdk_jfr # All jdk tests