OpenJDK / portola / portola
changeset 28006:ebad70f3aa9f
8065673: XML Test Colo: Add test build system for JAXP tests
Reviewed-by: alanb, joehw
Contributed-by: tristan.yan@oracle.com
| author | joehw |
|---|---|
| date | Mon, 15 Dec 2014 13:09:39 -0800 |
| parents | 836eb8cb6448 |
| children | 877ab0d032b8 |
| files | make/jprt.properties test/Makefile |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Mon Dec 15 10:29:41 2014 -0800 +++ b/make/jprt.properties Mon Dec 15 13:09:39 2014 -0800 @@ -188,6 +188,13 @@ ${my.test.target.set:TESTNAME=svc_tools}, \ ${my.make.rule.test.targets.svc.extra} +# JAXP vm test targets (testset=jaxp) +my.test.targets.jaxp= + +# JAXP test targets (testset=jaxp) +my.make.rule.test.targets.jaxp= \ + ${my.test.target.set:TESTNAME=jaxp_all} + # All vm test targets (testset=all) my.test.targets.all= \ ${my.test.targets.default}, \ @@ -211,7 +218,8 @@ my.make.rule.test.targets.pit= \ ${my.test.target.set:TESTNAME=langtools_jtreg}, \ ${my.make.rule.test.targets.core}, \ - ${my.make.rule.test.targets.svc} + ${my.make.rule.test.targets.svc} \ + ${my.make.rule.test.targets.jaxp} # JCK test targets in test/Makefile (no windows) my.test.target.set.jck= \
--- a/test/Makefile Mon Dec 15 10:29:41 2014 -0800 +++ b/test/Makefile Mon Dec 15 13:09:39 2014 -0800 @@ -33,6 +33,7 @@ # This makefile depends on the availability of sibling directories. LANGTOOLS_DIR=$(TOPDIR)/langtools JDK_DIR=$(TOPDIR)/jdk +JAXP_DIR=$(TOPDIR)/jaxp HOTSPOT_DIR=$(TOPDIR)/hotspot # Macro to run a test target in a subdir @@ -51,10 +52,10 @@ endef # Default test target (core) -default: jdk_core langtools_jtreg +default: jdk_core langtools_jtreg jaxp_all # All testing -all: jdk_all langtools_all +all: jdk_all langtools_all jaxp_all # Test targets langtools_% : @@ -63,6 +64,9 @@ jdk_% core_%s svc_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) +jaxp_%: + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), TEST="$@" $@) + hotspot_%: @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@)