aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorlana <none@none>2012-10-25 20:04:23 -0700
committerlana <none@none>2012-10-25 20:04:23 -0700
commite494ddc0e4aa941a9d2b9e35ecc750c55193e269 (patch)
treeb6983f9685d876031345e7dfe12dea96d18ef295 /make
parent9b3dec9ffa5e8ff0cf4c6e58e3210484132c4fbb (diff)
parent29b9137619fe8ccfb437d6d5f3369ae85f6c1e28 (diff)
Merge
Diffstat (limited to 'make')
-rw-r--r--make/jprt.properties14
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= \