stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8028478: Re-visit JPRT testsets to make it easier to run subsets of the tests

Browse Source 
Reviewed-by: dholmes, sla, tbell
This commit is contained in:
Alan Bateman 2013-11-19 14:11:59 +00:00
parent 1a8ec8e251
commit e0fbec8e0b
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
make/jprt.properties
View File

@ -66,15 +66,17 @@ jprt.vm.default.test.targets= \
jprt.make.rule.default.test.targets= \
${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
${jprt.my.test.target.set:TESTNAME=jdk_math}
${jprt.my.test.target.set:TESTNAME=jdk_math}, \
${jprt.my.test.target.set:TESTNAME=jdk_util}
# Default vm test targets (testset=core)
jprt.vm.core.test.targets= \
${jprt.vm.default.test.targets}
jprt.vm.core.test.targets=
# Core jdk test targets (testset=core)
jprt.make.rule.core.test.targets= \
${jprt.make.rule.default.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
${jprt.my.test.target.set:TESTNAME=jdk_math}, \
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
@ -83,13 +85,22 @@ jprt.make.rule.core.test.targets= \
${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_management}, \
${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_jfr}, \
${jprt.my.test.target.set:TESTNAME=jdk_time}, \
${jprt.my.test.target.set:TESTNAME=jdk_other}
${jprt.my.test.target.set:TESTNAME=jdk_other}, \
${jprt.my.test.target.set:TESTNAME=core_tools}
# Svc vm test targets (testset=svc)
jprt.vm.svc.test.targets=
# Core jdk test targets (testset=svc)
jprt.make.rule.svc.test.targets= \
${jprt.my.test.target.set:TESTNAME=jdk_management}, \
${jprt.my.test.target.set:TESTNAME=jdk_instrument}, \
${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
${jprt.my.test.target.set:TESTNAME=svc_tools}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
@ -100,14 +111,24 @@ jprt.vm.all.test.targets= \
# All jdk test targets (testset=all)
jprt.make.rule.all.test.targets= \
${jprt.make.rule.core.test.targets}, \
${jprt.make.rule.svc.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
${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}
# PIT vm test targets (testset=pit)
jprt.vm.pit.test.targets= \
${jprt.vm.all.test.targets}
# PIT jdk test targets (testset=pit)
jprt.make.rule.pit.test.targets= \
${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
${jprt.make.rule.core.test.targets}, \
${jprt.make.rule.svc.test.targets}
# JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \

2
test/Makefile
View File

@ -59,7 +59,7 @@ all: jdk_all langtools_all
langtools_% :
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
jdk_% :
jdk_% core_%s svc_%:
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
################################################################