Merge

Mon, 10 Dec 2012 20:52:08 -0800

author
lana
date
Mon, 10 Dec 2012 20:52:08 -0800
changeset 530
04435608c613
parent 527
c91c581321ce
parent 529
ad54163c95f5
child 534
cdb401a60cea

Merge

     1.1 --- a/make/jprt.properties	Thu Dec 06 12:04:11 2012 -0800
     1.2 +++ b/make/jprt.properties	Mon Dec 10 20:52:08 2012 -0800
     1.3 @@ -88,7 +88,6 @@
     1.4      ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
     1.5      ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
     1.6      ${jprt.my.test.target.set:TESTNAME=jdk_tools},              \
     1.7 -    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
     1.8      ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
     1.9      ${jprt.my.test.target.set:TESTNAME=jdk_other}
    1.10  
    1.11 @@ -105,6 +104,7 @@
    1.12      ${jprt.my.test.target.set:TESTNAME=jdk_beans1},             \
    1.13      ${jprt.my.test.target.set:TESTNAME=jdk_beans2},		\
    1.14      ${jprt.my.test.target.set:TESTNAME=jdk_beans3},		\
    1.15 +    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
    1.16      ${jprt.my.test.target.set:TESTNAME=jdk_sound},		\
    1.17      ${jprt.my.test.target.set:TESTNAME=jdk_swing}
    1.18  

mercurial