Merge
This commit is contained in:
Lana Steuck
commit
045f71ec25
14
Makefile
14
Makefile
@ -558,9 +558,12 @@ endif
|
||||
# rule to test
|
||||
################################################################
|
||||
|
||||
.NOTPARALLEL: test
|
||||
.NOTPARALLEL: test_run
|
||||
|
||||
test: test_clean test_start test_summary
|
||||
test:
|
||||
$(MAKE) test_run
|
||||
|
||||
test_run: test_clean test_start test_summary
|
||||
|
||||
test_start:
|
||||
@$(ECHO) "Tests started at `$(DATE)`"
|
||||
@ -586,7 +589,7 @@ test_summary: $(OUTPUTDIR)/test_failures.txt
|
||||
# Get failure list from log
|
||||
$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
|
||||
@$(RM) $@
|
||||
@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
|
||||
@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
|
||||
|
||||
# Get log file of all tests run
|
||||
JDK_TO_TEST := $(shell \
|
||||
@ -598,10 +601,11 @@ JDK_TO_TEST := $(shell \
|
||||
$(ECHO) "$(PRODUCT_HOME)"; \
|
||||
fi \
|
||||
)
|
||||
TEST_TARGETS=all
|
||||
$(OUTPUTDIR)/test_log.txt:
|
||||
$(RM) $@
|
||||
( $(CD) test && \
|
||||
$(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
|
||||
$(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
|
||||
) | tee $@
|
||||
|
||||
################################################################
|
||||
@ -614,7 +618,7 @@ include ./make/jprt.gmk
|
||||
# PHONY
|
||||
################################################################
|
||||
|
||||
.PHONY: all test test_start test_summary test_clean \
|
||||
.PHONY: all test test_run test_start test_summary test_clean \
|
||||
generic_build_repo_series \
|
||||
what clobber insane \
|
||||
dev dev-build dev-sanity dev-clobber \
|
||||
|
||||
@ -25,49 +25,310 @@
|
||||
|
||||
# Properties for jprt
|
||||
|
||||
# Use whatever release that the submitted job requests
|
||||
# At submit time, the release supplied will be in jprt.submit.release
|
||||
# and will be one of the official release names defined in jprt.
|
||||
# jprt supports property value expansion using ${property.name} syntax.
|
||||
|
||||
# This tells jprt what default release we want to build
|
||||
jprt.tools.default.release=${jprt.submit.release}
|
||||
|
||||
# The different build flavors we want, we override here so we just get these 2
|
||||
jprt.build.flavors=product,fastdebug
|
||||
|
||||
# Shortened list of vm tests
|
||||
jprt.test.targets= \
|
||||
*-product-*-jvm98, \
|
||||
*-product-*-scimark, \
|
||||
*-product-*-runThese, \
|
||||
*-product-*-GCBasher_default, \
|
||||
*-product-*-GCOld_default, \
|
||||
*-product-*-jbb_default
|
||||
# Define the Windows we want (temporary)
|
||||
jprt.my.windows.i586.jdk7b107=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk7temp=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk7=windows_i586_5.1
|
||||
jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
|
||||
|
||||
# Test targets in test/Makefile
|
||||
jprt.make.rule.test.targets= \
|
||||
*-product-*-langtools_jtreg, \
|
||||
*-product-*-jdk_beans1, \
|
||||
*-product-*-jdk_beans2, \
|
||||
*-product-*-jdk_beans3, \
|
||||
*-product-*-jdk_io, \
|
||||
*-product-*-jdk_lang, \
|
||||
*-product-*-jdk_management1, \
|
||||
*-product-*-jdk_management2, \
|
||||
*-product-*-jdk_math, \
|
||||
*-product-*-jdk_misc, \
|
||||
*-product-*-jdk_net, \
|
||||
*-product-*-jdk_nio1, \
|
||||
*-product-*-jdk_nio2, \
|
||||
*-product-*-jdk_nio3, \
|
||||
*-product-*-jdk_security1, \
|
||||
*-product-*-jdk_security2, \
|
||||
*-product-*-jdk_security3, \
|
||||
*-product-*-jdk_text, \
|
||||
*-product-*-jdk_tools1, \
|
||||
*-product-*-jdk_tools2, \
|
||||
*-product-*-jdk_util
|
||||
# Standard list of jprt build targets for this source tree
|
||||
jprt.build.targets= \
|
||||
solaris_sparc_5.10-{product|fastdebug}, \
|
||||
solaris_sparcv9_5.10-{product|fastdebug}, \
|
||||
solaris_i586_5.10-{product|fastdebug}, \
|
||||
solaris_x64_5.10-{product|fastdebug}, \
|
||||
linux_i586_2.6-{product|fastdebug}, \
|
||||
linux_x64_2.6-{product|fastdebug}, \
|
||||
${jprt.my.windows.i586}-{product|fastdebug}, \
|
||||
windows_x64_5.2-{product|fastdebug}
|
||||
|
||||
# Not Ready Yet:
|
||||
# *-product-*-jdk_awt
|
||||
# *-product-*-jdk_rmi
|
||||
# *-product-*-jdk_swing
|
||||
# User can select the test set with jprt submit "-testset name" option
|
||||
jprt.my.test.set=${jprt.test.set}
|
||||
|
||||
# Default vm test targets (no fastdebug & limited c2 testing)
|
||||
jprt.vm.default.test.targets= \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jvm98, \
|
||||
solaris_sparcv9_5.10-product-c2-jvm98, \
|
||||
solaris_i586_5.10-product-c1-jvm98, \
|
||||
solaris_x64_5.10-product-c2-jvm98, \
|
||||
linux_i586_2.6-product-{c1|c2}-jvm98, \
|
||||
linux_x64_2.6-product-c2-jvm98, \
|
||||
${jprt.my.windows.i586}-product-c1-jvm98, \
|
||||
windows_x64_5.2-product-c2-jvm98, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-scimark, \
|
||||
solaris_sparcv9_5.10-product-c2-scimark, \
|
||||
solaris_i586_5.10-product-c1-scimark, \
|
||||
solaris_x64_5.10-product-c2-scimark, \
|
||||
linux_i586_2.6-product-{c1|c2}-scimark, \
|
||||
linux_x64_2.6-product-c2-scimark, \
|
||||
${jprt.my.windows.i586}-product-c1-scimark, \
|
||||
windows_x64_5.2-product-c2-scimark
|
||||
|
||||
# Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing)
|
||||
jprt.make.rule.default.test.targets= \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-langtools_jtreg, \
|
||||
solaris_sparcv9_5.10-product-c2-langtools_jtreg, \
|
||||
solaris_i586_5.10-product-c1-langtools_jtreg, \
|
||||
solaris_x64_5.10-product-c2-langtools_jtreg, \
|
||||
linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \
|
||||
linux_x64_2.6-product-c2-langtools_jtreg, \
|
||||
${jprt.my.windows.i586}-product-c1-langtools_jtreg, \
|
||||
windows_x64_5.2-product-c2-langtools_jtreg, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans1, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans1, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
|
||||
linux_x64_2.6-product-c2-jdk_beans1, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_beans1, \
|
||||
windows_x64_5.2-product-c2-jdk_beans1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_io, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_io, \
|
||||
solaris_i586_5.10-product-c1-jdk_io, \
|
||||
solaris_x64_5.10-product-c2-jdk_io, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_io, \
|
||||
linux_x64_2.6-product-c2-jdk_io, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_io, \
|
||||
windows_x64_5.2-product-c2-jdk_io, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_lang, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_lang, \
|
||||
solaris_i586_5.10-product-c1-jdk_lang, \
|
||||
solaris_x64_5.10-product-c2-jdk_lang, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_lang, \
|
||||
linux_x64_2.6-product-c2-jdk_lang, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_lang, \
|
||||
windows_x64_5.2-product-c2-jdk_lang, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_math, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_math, \
|
||||
solaris_i586_5.10-product-c1-jdk_math, \
|
||||
solaris_x64_5.10-product-c2-jdk_math, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_math, \
|
||||
linux_x64_2.6-product-c2-jdk_math, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_math, \
|
||||
windows_x64_5.2-product-c2-jdk_math, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_misc, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_misc, \
|
||||
solaris_i586_5.10-product-c1-jdk_misc, \
|
||||
solaris_x64_5.10-product-c2-jdk_misc, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_misc, \
|
||||
linux_x64_2.6-product-c2-jdk_misc, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_misc, \
|
||||
windows_x64_5.2-product-c2-jdk_misc, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_net, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_net, \
|
||||
solaris_i586_5.10-product-c1-jdk_net, \
|
||||
solaris_x64_5.10-product-c2-jdk_net, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_net, \
|
||||
linux_x64_2.6-product-c2-jdk_net, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_net, \
|
||||
windows_x64_5.2-product-c2-jdk_net, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio1, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio1, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
|
||||
linux_x64_2.6-product-c2-jdk_nio1, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_nio1, \
|
||||
windows_x64_5.2-product-c2-jdk_nio1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio2, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio2, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
|
||||
linux_x64_2.6-product-c2-jdk_nio2, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_nio2, \
|
||||
windows_x64_5.2-product-c2-jdk_nio2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio3, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio3, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
|
||||
linux_x64_2.6-product-c2-jdk_nio3, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_nio3, \
|
||||
windows_x64_5.2-product-c2-jdk_nio3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security1, \
|
||||
solaris_i586_5.10-product-c1-jdk_security1, \
|
||||
solaris_x64_5.10-product-c2-jdk_security1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security1, \
|
||||
linux_x64_2.6-product-c2-jdk_security1, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_security1, \
|
||||
windows_x64_5.2-product-c2-jdk_security1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_text, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_text, \
|
||||
solaris_i586_5.10-product-c1-jdk_text, \
|
||||
solaris_x64_5.10-product-c2-jdk_text, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_text, \
|
||||
linux_x64_2.6-product-c2-jdk_text, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_text, \
|
||||
windows_x64_5.2-product-c2-jdk_text, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_tools1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_tools1, \
|
||||
solaris_i586_5.10-product-c1-jdk_tools1, \
|
||||
solaris_x64_5.10-product-c2-jdk_tools1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
|
||||
linux_x64_2.6-product-c2-jdk_tools1, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_tools1, \
|
||||
windows_x64_5.2-product-c2-jdk_tools1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_util, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_util, \
|
||||
solaris_i586_5.10-product-c1-jdk_util, \
|
||||
solaris_x64_5.10-product-c2-jdk_util, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_util, \
|
||||
linux_x64_2.6-product-c2-jdk_util, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_util, \
|
||||
windows_x64_5.2-product-c2-jdk_util
|
||||
|
||||
# All vm test targets (but still no fastdebug & limited c2 testing)
|
||||
jprt.vm.all.test.targets= \
|
||||
\
|
||||
${jprt.vm.default.test.targets}, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-runThese, \
|
||||
solaris_sparcv9_5.10-product-c2-runThese, \
|
||||
solaris_i586_5.10-product-c1-runThese, \
|
||||
solaris_x64_5.10-product-c2-runThese, \
|
||||
linux_i586_2.6-product-{c1|c2}-runThese, \
|
||||
linux_x64_2.6-product-c2-runThese, \
|
||||
${jprt.my.windows.i586}-product-c1-runThese, \
|
||||
windows_x64_5.2-product-c2-runThese, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jbb_default, \
|
||||
solaris_sparcv9_5.10-product-c2-jbb_default, \
|
||||
solaris_i586_5.10-product-c1-jbb_default, \
|
||||
solaris_x64_5.10-product-c2-jbb_default, \
|
||||
linux_i586_2.6-product-{c1|c2}-jbb_default, \
|
||||
linux_x64_2.6-product-c2-jbb_default, \
|
||||
${jprt.my.windows.i586}-product-c1-jbb_default, \
|
||||
windows_x64_5.2-product-c2-jbb_default
|
||||
|
||||
# All jdk test targets (but still no fastdebug & limited c2 testing)
|
||||
jprt.make.rule.all.test.targets= \
|
||||
\
|
||||
${jprt.make.rule.default.test.targets}, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_awt, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_awt, \
|
||||
solaris_i586_5.10-product-c1-jdk_awt, \
|
||||
solaris_x64_5.10-product-c2-jdk_awt, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_awt, \
|
||||
linux_x64_2.6-product-c2-jdk_awt, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_awt, \
|
||||
windows_x64_5.2-product-c2-jdk_awt, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans2, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans2, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
|
||||
linux_x64_2.6-product-c2-jdk_beans2, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_beans2, \
|
||||
windows_x64_5.2-product-c2-jdk_beans2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans3, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans3, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
|
||||
linux_x64_2.6-product-c2-jdk_beans3, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_beans3, \
|
||||
windows_x64_5.2-product-c2-jdk_beans3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_management1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_management1, \
|
||||
solaris_i586_5.10-product-c1-jdk_management1, \
|
||||
solaris_x64_5.10-product-c2-jdk_management1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_management1, \
|
||||
linux_x64_2.6-product-c2-jdk_management1, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_management1, \
|
||||
windows_x64_5.2-product-c2-jdk_management1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_management2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_management2, \
|
||||
solaris_i586_5.10-product-c1-jdk_management2, \
|
||||
solaris_x64_5.10-product-c2-jdk_management2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_management2, \
|
||||
linux_x64_2.6-product-c2-jdk_management2, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_management2, \
|
||||
windows_x64_5.2-product-c2-jdk_management2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_rmi, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_rmi, \
|
||||
solaris_i586_5.10-product-c1-jdk_rmi, \
|
||||
solaris_x64_5.10-product-c2-jdk_rmi, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
|
||||
linux_x64_2.6-product-c2-jdk_rmi, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_rmi, \
|
||||
windows_x64_5.2-product-c2-jdk_rmi, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security2, \
|
||||
solaris_i586_5.10-product-c1-jdk_security2, \
|
||||
solaris_x64_5.10-product-c2-jdk_security2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security2, \
|
||||
linux_x64_2.6-product-c2-jdk_security2, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_security2, \
|
||||
windows_x64_5.2-product-c2-jdk_security2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security3, \
|
||||
solaris_i586_5.10-product-c1-jdk_security3, \
|
||||
solaris_x64_5.10-product-c2-jdk_security3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security3, \
|
||||
linux_x64_2.6-product-c2-jdk_security3, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_security3, \
|
||||
windows_x64_5.2-product-c2-jdk_security3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_swing, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_swing, \
|
||||
solaris_i586_5.10-product-c1-jdk_swing, \
|
||||
solaris_x64_5.10-product-c2-jdk_swing, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_swing, \
|
||||
linux_x64_2.6-product-c2-jdk_swing, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_swing, \
|
||||
windows_x64_5.2-product-c2-jdk_swing, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_tools2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_tools2, \
|
||||
solaris_i586_5.10-product-c1-jdk_tools2, \
|
||||
solaris_x64_5.10-product-c2-jdk_tools2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
|
||||
linux_x64_2.6-product-c2-jdk_tools2, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_tools2, \
|
||||
windows_x64_5.2-product-c2-jdk_tools2
|
||||
|
||||
# Select list to use (allow for testset to be empty too)
|
||||
jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
|
||||
jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
|
||||
jprt.vm..test.targets=${jprt.vm.default.test.targets}
|
||||
jprt.vm.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
|
||||
jprt.test.targets=${jprt.vm.test.targets}
|
||||
|
||||
# Directories to be excluded from the source bundles
|
||||
jprt.bundle.exclude.src.dirs=build dist webrev
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user