Merge

Thu, 25 Oct 2012 20:04:23 -0700

author
lana
date
Thu, 25 Oct 2012 20:04:23 -0700
changeset 493
ce212cd7ea69
parent 489
4e984be114bd
parent 492
744e165aaf33
child 496
3229597524ca
child 499
fc61be4ff6ae

Merge

     1.1 --- a/make/jprt.properties	Thu Oct 25 09:52:58 2012 -0700
     1.2 +++ b/make/jprt.properties	Thu Oct 25 20:04:23 2012 -0700
     1.3 @@ -79,20 +79,18 @@
     1.4      ${jprt.my.test.target.set:TESTNAME=jdk_util},               \
     1.5      ${jprt.my.test.target.set:TESTNAME=jdk_io},			\
     1.6      ${jprt.my.test.target.set:TESTNAME=jdk_net},		\
     1.7 -    ${jprt.my.test.target.set:TESTNAME=jdk_nio1},		\
     1.8 -    ${jprt.my.test.target.set:TESTNAME=jdk_nio2},		\
     1.9 -    ${jprt.my.test.target.set:TESTNAME=jdk_nio3},		\
    1.10 +    ${jprt.my.test.target.set:TESTNAME=jdk_nio},		\
    1.11      ${jprt.my.test.target.set:TESTNAME=jdk_security1},		\
    1.12      ${jprt.my.test.target.set:TESTNAME=jdk_security2},          \
    1.13      ${jprt.my.test.target.set:TESTNAME=jdk_security3},          \
    1.14      ${jprt.my.test.target.set:TESTNAME=jdk_rmi},                \
    1.15 -    ${jprt.my.test.target.set:TESTNAME=jdk_management1},        \
    1.16 -    ${jprt.my.test.target.set:TESTNAME=jdk_management2},        \
    1.17 +    ${jprt.my.test.target.set:TESTNAME=jdk_management},         \
    1.18 +    ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
    1.19      ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
    1.20 -    ${jprt.my.test.target.set:TESTNAME=jdk_tools1},             \
    1.21 -    ${jprt.my.test.target.set:TESTNAME=jdk_tools2},             \
    1.22 +    ${jprt.my.test.target.set:TESTNAME=jdk_tools},              \
    1.23 +    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
    1.24      ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
    1.25 -    ${jprt.my.test.target.set:TESTNAME=jdk_misc}
    1.26 +    ${jprt.my.test.target.set:TESTNAME=jdk_other}
    1.27  
    1.28  # All vm test targets (testset=all)
    1.29  jprt.vm.all.test.targets=    					\
     2.1 --- a/test/Makefile	Thu Oct 25 09:52:58 2012 -0700
     2.2 +++ b/test/Makefile	Thu Oct 25 20:04:23 2012 -0700
     2.3 @@ -58,9 +58,9 @@
     2.4  	jdk_io  \
     2.5  	jdk_lang  \
     2.6  	jdk_math  \
     2.7 -	jdk_misc  \
     2.8 +	jdk_other  \
     2.9  	jdk_net  \
    2.10 -	jdk_nio1 jdk_nio2 jdk_nio3  \
    2.11 +	jdk_nio \
    2.12  	jdk_security1 \
    2.13  	jdk_text  \
    2.14  	jdk_util
    2.15 @@ -69,12 +69,14 @@
    2.16  JDK_NONDEFAULT_TEST_LIST = \
    2.17  	jdk_awt \
    2.18  	jdk_beans2 jdk_beans3  \
    2.19 -	jdk_management1 jdk_management2  \
    2.20 +	jdk_management \
    2.21 +	jdk_jmx \
    2.22  	jdk_security2 jdk_security3  \
    2.23  	jdk_rmi \
    2.24  	jdk_sound \
    2.25  	jdk_swing \
    2.26 -	jdk_tools1 jdk_tools2 \
    2.27 +	jdk_tools \
    2.28 +	jdk_jdi \
    2.29  	jdk_jfr
    2.30  
    2.31  # All jdk tests

mercurial