Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/jprt.properties	Thu Nov 14 10:53:23 2013 +0100
     1.2 +++ b/make/jprt.properties	Tue Nov 19 14:11:59 2013 +0000
     1.3 @@ -66,15 +66,17 @@
     1.4  jprt.make.rule.default.test.targets=				\
     1.5      ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},        \
     1.6      ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
     1.7 -    ${jprt.my.test.target.set:TESTNAME=jdk_math}
     1.8 +    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
     1.9 +    ${jprt.my.test.target.set:TESTNAME=jdk_util}
    1.10 +    
    1.11  
    1.12  # Default vm test targets (testset=core)
    1.13 -jprt.vm.core.test.targets=                                      \
    1.14 -    ${jprt.vm.default.test.targets}
    1.15 +jprt.vm.core.test.targets=
    1.16  
    1.17  # Core jdk test targets (testset=core)
    1.18  jprt.make.rule.core.test.targets=                               \
    1.19 -    ${jprt.make.rule.default.test.targets},                     \
    1.20 +    ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
    1.21 +    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
    1.22      ${jprt.my.test.target.set:TESTNAME=jdk_util},               \
    1.23      ${jprt.my.test.target.set:TESTNAME=jdk_io},			\
    1.24      ${jprt.my.test.target.set:TESTNAME=jdk_net},		\
    1.25 @@ -83,13 +85,22 @@
    1.26      ${jprt.my.test.target.set:TESTNAME=jdk_security2},          \
    1.27      ${jprt.my.test.target.set:TESTNAME=jdk_security3},          \
    1.28      ${jprt.my.test.target.set:TESTNAME=jdk_rmi},                \
    1.29 +    ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
    1.30 +    ${jprt.my.test.target.set:TESTNAME=jdk_time},               \
    1.31 +    ${jprt.my.test.target.set:TESTNAME=jdk_other},              \
    1.32 +    ${jprt.my.test.target.set:TESTNAME=core_tools}
    1.33 +
    1.34 +# Svc vm test targets (testset=svc)
    1.35 +jprt.vm.svc.test.targets=
    1.36 +
    1.37 +# Core jdk test targets (testset=svc)
    1.38 +jprt.make.rule.svc.test.targets=                                \
    1.39      ${jprt.my.test.target.set:TESTNAME=jdk_management},         \
    1.40 +    ${jprt.my.test.target.set:TESTNAME=jdk_instrument},         \
    1.41      ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
    1.42 -    ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
    1.43 -    ${jprt.my.test.target.set:TESTNAME=jdk_tools},              \
    1.44 +    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
    1.45      ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
    1.46 -    ${jprt.my.test.target.set:TESTNAME=jdk_time},               \
    1.47 -    ${jprt.my.test.target.set:TESTNAME=jdk_other}
    1.48 +    ${jprt.my.test.target.set:TESTNAME=svc_tools}
    1.49  
    1.50  # All vm test targets (testset=all)
    1.51  jprt.vm.all.test.targets=    					\
    1.52 @@ -100,14 +111,24 @@
    1.53  # All jdk test targets (testset=all)
    1.54  jprt.make.rule.all.test.targets=    				\
    1.55      ${jprt.make.rule.core.test.targets}, 			\
    1.56 +    ${jprt.make.rule.svc.test.targets},                         \
    1.57      ${jprt.my.test.target.set:TESTNAME=jdk_awt},		\
    1.58      ${jprt.my.test.target.set:TESTNAME=jdk_beans1},             \
    1.59      ${jprt.my.test.target.set:TESTNAME=jdk_beans2},		\
    1.60      ${jprt.my.test.target.set:TESTNAME=jdk_beans3},		\
    1.61 -    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
    1.62      ${jprt.my.test.target.set:TESTNAME=jdk_sound},		\
    1.63      ${jprt.my.test.target.set:TESTNAME=jdk_swing}
    1.64  
    1.65 +# PIT vm test targets (testset=pit)
    1.66 +jprt.vm.pit.test.targets=                                       \
    1.67 +   ${jprt.vm.all.test.targets}
    1.68 +
    1.69 +# PIT jdk test targets (testset=pit)
    1.70 +jprt.make.rule.pit.test.targets=                                \
    1.71 +    ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},        \
    1.72 +    ${jprt.make.rule.core.test.targets},                        \
    1.73 +    ${jprt.make.rule.svc.test.targets}
    1.74 +
    1.75  # JCK test targets in test/Makefile (no windows)
    1.76  jprt.my.jck.test.target.set=					\
    1.77      solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\

     2.1 --- a/test/Makefile	Thu Nov 14 10:53:23 2013 +0100
     2.2 +++ b/test/Makefile	Tue Nov 19 14:11:59 2013 +0000
     2.3 @@ -59,7 +59,7 @@
     2.4  langtools_% :
     2.5  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
     2.6  
     2.7 -jdk_% :
     2.8 +jdk_% core_%s svc_%:
     2.9  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
    2.10  
    2.11  ################################################################