6902666: Include closed tests in the test/Makefile jdk_* targets
6902667: Fix JT_HOME not working from env in jdk/test/Makefile Reviewed-by: mullan, dcubed
This commit is contained in:
parent
3552fe5b4a
commit
d020b04219
jdk/test
@ -337,9 +337,11 @@ clean:
|
||||
# jtreg tests
|
||||
|
||||
# Expect JT_HOME to be set for jtreg tests. (home for jtreg)
|
||||
JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
|
||||
ifdef JPRT_JTREG_HOME
|
||||
JT_HOME = $(JPRT_JTREG_HOME)
|
||||
ifndef JT_HOME
|
||||
JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
|
||||
ifdef JPRT_JTREG_HOME
|
||||
JT_HOME = $(JPRT_JTREG_HOME)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Expect JPRT to set TESTDIRS to the jtreg test dirs
|
||||
@ -361,21 +363,22 @@ endif
|
||||
|
||||
# Some tests annoy me and fail frequently
|
||||
PROBLEM_LIST=ProblemList.txt
|
||||
PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
|
||||
EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt
|
||||
|
||||
# Create exclude list for this platform and arch
|
||||
ifdef NO_EXCLUDES
|
||||
$(EXCLUDELIST): $(PROBLEM_LIST) $(TESTDIRS)
|
||||
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS)
|
||||
@$(ECHO) "NOTHING_EXCLUDED" > $@
|
||||
else
|
||||
$(EXCLUDELIST): $(PROBLEM_LIST) $(TESTDIRS)
|
||||
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS)
|
||||
@$(RM) $@ $@.temp1 $@.temp2
|
||||
@( ( $(EGREP) -- '$(OS_NAME)-all' $< ) ;\
|
||||
( $(EGREP) -- '$(OS_NAME)-$(OS_ARCH)' $< ) ;\
|
||||
( $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)' $< ) ;\
|
||||
( $(EGREP) -- 'generic-$(OS_ARCH)' $< ) ;\
|
||||
( $(EGREP) -- 'generic-all' $< ) ;\
|
||||
( $(ECHO) "#") ;\
|
||||
@(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all' ) ;\
|
||||
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH)' ) ;\
|
||||
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
|
||||
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)' ) ;\
|
||||
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\
|
||||
($(ECHO) "#") ;\
|
||||
) | $(SED) -e 's@^[\ ]*@@' \
|
||||
| $(EGREP) -v '^#' > $@.temp1
|
||||
@for tdir in $(TESTDIRS) ; do \
|
||||
@ -386,14 +389,18 @@ $(EXCLUDELIST): $(PROBLEM_LIST) $(TESTDIRS)
|
||||
@$(ECHO) "Excluding list contains `$(EXPAND) $@ | $(WC) -l` items"
|
||||
endif
|
||||
|
||||
# Select list of directories that exist
|
||||
define TestDirs
|
||||
$(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i}))
|
||||
endef
|
||||
# Running batches of tests with or without samevm
|
||||
define RunSamevmBatch
|
||||
$(ECHO) "Running tests in samevm mode: $?"
|
||||
$(MAKE) TESTDIRS="$?" USE_JTREG_SAMEVM=true UNIQUE_DIR=$@ jtreg_tests
|
||||
$(ECHO) "Running tests in samevm mode: $(call TestDirs, $?)"
|
||||
$(MAKE) TESTDIRS="$(call TestDirs, $?)" USE_JTREG_SAMEVM=true UNIQUE_DIR=$@ jtreg_tests
|
||||
endef
|
||||
define RunOthervmBatch
|
||||
$(ECHO) "Running tests in othervm mode: $?"
|
||||
$(MAKE) TESTDIRS="$?" USE_JTREG_SAMEVM=false UNIQUE_DIR=$@ jtreg_tests
|
||||
$(ECHO) "Running tests in othervm mode: $(call TestDirs, $?)"
|
||||
$(MAKE) TESTDIRS="$(call TestDirs, $?)" USE_JTREG_SAMEVM=false UNIQUE_DIR=$@ jtreg_tests
|
||||
endef
|
||||
define SummaryInfo
|
||||
$(ECHO) "Summary for: $?"
|
||||
@ -428,6 +435,9 @@ JDK_ALL_TARGETS += jdk_beans3
|
||||
jdk_beans3: java/beans/XMLEncoder
|
||||
$(call RunOthervmBatch)
|
||||
|
||||
jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
|
||||
@$(SummaryInfo)
|
||||
|
||||
# Stable samevm testruns (minus items from PROBLEM_LIST)
|
||||
JDK_ALL_TARGETS += jdk_io
|
||||
jdk_io: java/io
|
||||
@ -450,6 +460,9 @@ JDK_ALL_TARGETS += jdk_management2
|
||||
jdk_management2: com/sun/jmx com/sun/management sun/management
|
||||
$(call RunOthervmBatch)
|
||||
|
||||
jdk_management: jdk_management1 jdk_management2
|
||||
@$(SummaryInfo)
|
||||
|
||||
# Stable samevm testruns (minus items from PROBLEM_LIST)
|
||||
JDK_ALL_TARGETS += jdk_math
|
||||
jdk_math: java/math
|
||||
@ -482,6 +495,9 @@ JDK_ALL_TARGETS += jdk_nio3
|
||||
jdk_nio3: com/sun/nio sun/nio
|
||||
$(call RunOthervmBatch)
|
||||
|
||||
jdk_nio: jdk_nio1 jdk_nio2 jdk_nio3
|
||||
@$(SummaryInfo)
|
||||
|
||||
# Stable othervm testruns (minus items from PROBLEM_LIST)
|
||||
# Using samevm has serious problems with these tests
|
||||
JDK_ALL_TARGETS += jdk_rmi
|
||||
@ -502,6 +518,9 @@ JDK_ALL_TARGETS += jdk_security3
|
||||
jdk_security3: com/sun/security lib/security javax/security sun/security
|
||||
$(call RunOthervmBatch)
|
||||
|
||||
jdk_security: jdk_security1 jdk_security2 jdk_security3
|
||||
@$(SummaryInfo)
|
||||
|
||||
# Stable othervm testruns (minus items from PROBLEM_LIST)
|
||||
# Using samevm has problems, and doesn't help performance as much as others.
|
||||
JDK_ALL_TARGETS += jdk_swing
|
||||
@ -522,6 +541,9 @@ JDK_ALL_TARGETS += jdk_tools2
|
||||
jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing
|
||||
$(call RunOthervmBatch)
|
||||
|
||||
jdk_tools: jdk_tools1 jdk_tools2
|
||||
@$(SummaryInfo)
|
||||
|
||||
# Stable samevm testruns (minus items from PROBLEM_LIST)
|
||||
JDK_ALL_TARGETS += jdk_util
|
||||
jdk_util: java/util sun/util
|
||||
|
@ -344,6 +344,9 @@ java/io/StreamTokenizer/Comment.java generic-all
|
||||
# Some of these tests (like java/lang/management) may just need to be marked
|
||||
# othervm, but that is partially speculation.
|
||||
|
||||
# Samevm failure on OpenSolaris, security manager?
|
||||
java/lang/ClassLoader/UninitializedParent.java generic-all
|
||||
|
||||
# Times out on solaris 10 sparc
|
||||
java/lang/ClassLoader/Assert.java generic-all
|
||||
|
||||
@ -538,6 +541,18 @@ javax/imageio/plugins/jpeg/ReadAsGrayTest.java generic-all
|
||||
# Missing close on file wbmp*, windows samevm
|
||||
javax/imageio/plugins/wbmp/CanDecodeTest.java generic-all
|
||||
|
||||
# Failures on OpenSolaris, cannot read input files? samevm issues?
|
||||
javax/imageio/metadata/BooleanAttributes.java generic-all
|
||||
javax/imageio/plugins/bmp/BMPSubsamplingTest.java generic-all
|
||||
javax/imageio/plugins/bmp/TopDownTest.java generic-all
|
||||
javax/imageio/plugins/gif/EncodeSubImageTest.java generic-all
|
||||
javax/imageio/plugins/gif/GifTransparencyTest.java generic-all
|
||||
javax/imageio/plugins/png/GrayPngTest.java generic-all
|
||||
javax/imageio/plugins/png/ItxtUtf8Test.java generic-all
|
||||
javax/imageio/plugins/png/MergeStdCommentTest.java generic-all
|
||||
javax/imageio/plugins/png/ShortHistogramTest.java generic-all
|
||||
javax/imageio/plugins/shared/BitDepth.java generic-all
|
||||
|
||||
# Exclude all javax/print tests, even if they passed, they may need samevm work
|
||||
|
||||
# Times out on solaris-sparc, sparcv9, x64 -server, some on i586 -client
|
||||
|
Loading…
x
Reference in New Issue
Block a user