diff options
| author | lana <none@none> | 2012-10-23 09:40:39 -0700 |
|---|---|---|
| committer | lana <none@none> | 2012-10-23 09:40:39 -0700 |
| commit | 29b9137619fe8ccfb437d6d5f3369ae85f6c1e28 (patch) | |
| tree | 040f33c508dd11e2fc7700e2406dc10b6b5347a1 /make | |
| parent | baad501f5fd4294a66df47b913b66116165b1f9b (diff) | |
| parent | b57c9dc14c57b7d7fcec639ce3b87f3b6e2c1f3b (diff) | |
Merge
Diffstat (limited to 'make')
| -rw-r--r-- | make/jprt.properties | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/make/jprt.properties b/make/jprt.properties index 2b044f0..984c2b1 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -79,20 +79,18 @@ jprt.make.rule.core.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_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= \ |