8065673: XML Test Colo: Add test build system for JAXP tests

Reviewed-by: alanb, joehw
This commit is contained in:
Tristan Yan 2014-12-15 13:09:39 -08:00 committed by Joe Wang
parent 12c05a89f5
commit a78b9855a8
2 changed files with 15 additions and 3 deletions

View File

@ -188,6 +188,13 @@ my.make.rule.test.targets.svc= \
${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.test.targets.pit= \
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= \

View File

@ -33,6 +33,7 @@ TOPDIR=..
# 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 @@ fi
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 @@ langtools_% :
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="$@" $@)