Merge
authorlana
Mon, 10 Dec 2012 20:52:08 -0800
changeset 14612 a40343dbb80f
parent 14609 87f50c0725e0 (current diff)
parent 14611 a122fa06c6eb (diff)
child 14616 388af7398bc9
Merge
--- a/make/jprt.properties	Thu Dec 06 12:04:11 2012 -0800
+++ b/make/jprt.properties	Mon Dec 10 20:52:08 2012 -0800
@@ -88,7 +88,6 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
     ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
     ${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_other}
 
@@ -105,6 +104,7 @@
     ${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_jdi},                \
     ${jprt.my.test.target.set:TESTNAME=jdk_sound},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_swing}