提交 848ddf55 编写于 作者: M mduigou

8006594: Add jdk_core target to jdk/test/Makefile

Reviewed-by: alanb
上级 2f520223
...@@ -63,6 +63,7 @@ jprt.vm.default.test.targets= \ ...@@ -63,6 +63,7 @@ jprt.vm.default.test.targets= \
${jprt.my.test.target.set:TESTNAME=jvm98} ${jprt.my.test.target.set:TESTNAME=jvm98}
# Default jdk test targets (testset=default) # Default jdk test targets (testset=default)
# NOTE: This does not match test/Makefile :: jdk_default
jprt.make.rule.default.test.targets= \ jprt.make.rule.default.test.targets= \
${jprt.my.test.target.set:TESTNAME=jdk_lang}, \ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
${jprt.my.test.target.set:TESTNAME=jdk_math} ${jprt.my.test.target.set:TESTNAME=jdk_math}
...@@ -72,6 +73,7 @@ jprt.vm.core.test.targets= \ ...@@ -72,6 +73,7 @@ jprt.vm.core.test.targets= \
${jprt.vm.default.test.targets} ${jprt.vm.default.test.targets}
# Core jdk test targets (testset=core) # Core jdk test targets (testset=core)
# NOTE: please keep this in sync with test/Makefile :: jdk_core
jprt.make.rule.core.test.targets= \ jprt.make.rule.core.test.targets= \
${jprt.make.rule.default.test.targets}, \ ${jprt.make.rule.default.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_util}, \ ${jprt.my.test.target.set:TESTNAME=jdk_util}, \
...@@ -97,6 +99,7 @@ jprt.vm.all.test.targets= \ ...@@ -97,6 +99,7 @@ jprt.vm.all.test.targets= \
${jprt.my.test.target.set:TESTNAME=jbb_default} ${jprt.my.test.target.set:TESTNAME=jbb_default}
# All jdk test targets (testset=all) # All jdk test targets (testset=all)
# NOTE: This does not match test/Makefile :: jdk_all
jprt.make.rule.all.test.targets= \ jprt.make.rule.all.test.targets= \
${jprt.make.rule.core.test.targets}, \ ${jprt.make.rule.core.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_awt}, \ ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
......
...@@ -342,8 +342,8 @@ prep: clean ...@@ -342,8 +342,8 @@ prep: clean
# Cleanup # Cleanup
clean: clean:
$(RM) -r $(ABS_TEST_OUTPUT_DIR) @$(RM) -r $(ABS_TEST_OUTPUT_DIR)
$(RM) $(ARCHIVE_BUNDLE) @$(RM) $(ARCHIVE_BUNDLE)
################################################################ ################################################################
...@@ -401,7 +401,7 @@ $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES) ...@@ -401,7 +401,7 @@ $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
($(ECHO) "#") ;\ ($(ECHO) "#") ;\
) | $(SED) -e 's@^[\ ]*@@' \ ) | $(SED) -e 's@^[\ ]*@@' \
| $(EGREP) -v '^#' > $@.temp1 | $(EGREP) -v '^#' > $@.temp1
for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \ @for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \
( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \ ( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \
done done
@$(ECHO) "# at least one line" >> $@.temp2 @$(ECHO) "# at least one line" >> $@.temp2
...@@ -431,6 +431,7 @@ endef ...@@ -431,6 +431,7 @@ endef
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Batches of tests (somewhat arbitrary assigments to jdk_* targets) # Batches of tests (somewhat arbitrary assigments to jdk_* targets)
# NOTE: These *do not* run the same tests as make/jprt.properties
JDK_DEFAULT_TARGETS = JDK_DEFAULT_TARGETS =
JDK_ALL_TARGETS = JDK_ALL_TARGETS =
...@@ -614,15 +615,24 @@ jdk_util: $(call TestDirs, java/util sun/util) ...@@ -614,15 +615,24 @@ jdk_util: $(call TestDirs, java/util sun/util)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Run default tests # Run default tests
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.default.test.targets
jdk_default: $(JDK_DEFAULT_TARGETS) jdk_default: $(JDK_DEFAULT_TARGETS)
@$(SummaryInfo) @$(SummaryInfo)
# Run core tests
# please keep this in sync with jdk/make/jprt.properties :: jprt.make.rule.core.test.targets
jdk_core: jdk_lang jdk_math jdk_util jdk_io jdk_net jdk_nio \
jdk_security1 jdk_security2 jdk_security3 jdk_rmi \
jdk_management jdk_jmx jdk_text jdk_tools jdk_jfr jdk_other
@$(SummaryInfo)
# Run all tests # Run all tests
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.all.test.targets
jdk_all: $(JDK_ALL_TARGETS) jdk_all: $(JDK_ALL_TARGETS)
@$(SummaryInfo) @$(SummaryInfo)
# These are all phony targets # These are all phony targets
PHONY_LIST += $(JDK_ALL_TARGETS) PHONY_LIST += $(JDK_ALL_TARGETS) jdk_default jdk_core jdk_all
# ------------------------------------------------------------------ # ------------------------------------------------------------------
...@@ -892,4 +902,3 @@ PHONY_LIST += jck_all _generic_jck_tests \ ...@@ -892,4 +902,3 @@ PHONY_LIST += jck_all _generic_jck_tests \
.PHONY: all clean prep $(PHONY_LIST) .PHONY: all clean prep $(PHONY_LIST)
################################################################ ################################################################
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
# as to why they are here and use a label: # as to why they are here and use a label:
# generic-all Problems on all platforms # generic-all Problems on all platforms
# generic-ARCH Where ARCH is one of: sparc, sparcv9, x64, i586, etc. # generic-ARCH Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
# OSNAME-all Where OSNAME is one of: solaris, linux, windows # OSNAME-all Where OSNAME is one of: solaris, linux, windows, macosx
# OSNAME-ARCH Specific on to one OSNAME and ARCH, e.g. solaris-x64 # OSNAME-ARCH Specific on to one OSNAME and ARCH, e.g. solaris-amd64
# OSNAME-REV Specific on to one OSNAME and REV, e.g. solaris-5.8 # OSNAME-REV Specific on to one OSNAME and REV, e.g. solaris-5.8
# #
# More than one label is allowed but must be on the same line. # More than one label is allowed but must be on the same line.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册