Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 ca38f8de 编写于 作者: M mduigou
浏览文件
操作

8021309: replace test/Makefile jdk_* targets with jtreg groups 

8015068: Use jtreg -exclude for handling problemList.txt exclusions
Reviewed-by: jjg, smarks, chegar, alanb, dholmes
上级 1368aa99
隐藏空白更改
内联 并排
Showing with 63 addition and 409 deletion
.hgignore
浏览文件 @ ca38f8de
^build/ ^build/
^dist/ ^dist/
^testoutput/
/nbproject/private/ /nbproject/private/
^make/netbeans/.*/build/ ^make/netbeans/.*/build/
^make/netbeans/.*/dist/ ^make/netbeans/.*/dist/
......
test/Makefile
浏览文件 @ ca38f8de
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
# Makefile to run various jdk tests # Makefile to run various jdk tests
# #
.DEFAULT : all
# Empty these to get rid of some default rules # Empty these to get rid of some default rules
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .java .SUFFIXES: .java
...@@ -55,150 +57,19 @@ UNIQ = uniq ...@@ -55,150 +57,19 @@ UNIQ = uniq
WC = wc WC = wc
ZIP = zip ZIP = zip
# Get OS name from uname # Get OS name from uname (Cygwin inexplicably adds _NT-5.1)
UNAME_S := $(shell $(UNAME) -s) UNAME_S := $(shell $(UNAME) -s | $(CUT) -f1 -d_)
# Commands to run on paths to make mixed paths for java on windows # Commands to run on paths to make mixed paths for java on windows
GETMIXEDPATH=$(ECHO) ifeq ($(UNAME_S), CYGWIN)
# Location of developer shared files
# Location of developer shared files
SLASH_JAVA = /java
# Platform specific settings
ifeq ($(UNAME_S), SunOS)
OS_NAME = solaris
OS_ARCH := $(shell $(UNAME) -p)
OS_VERSION := $(shell $(UNAME) -r)
endif
ifeq ($(UNAME_S), Linux)
OS_NAME = linux
OS_ARCH := $(shell $(UNAME) -m)
# Check for unknown arch, try uname -p if uname -m says unknown
ifeq ($(OS_ARCH),unknown)
OS_ARCH := $(shell $(UNAME) -p)
endif
OS_VERSION := $(shell $(UNAME) -r)
endif
ifeq ($(UNAME_S), Darwin)
OS_NAME = macosx
OS_ARCH := $(shell $(UNAME) -m)
# Check for unknown arch, try uname -p if uname -m says unknown
ifeq ($(OS_ARCH),unknown)
OS_ARCH := $(shell $(UNAME) -p)
endif
OS_VERSION := $(shell $(UNAME) -r)
endif
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
# return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead.
ifeq ($(PROCESSOR_IDENTIFIER),)
PROC_ARCH:=$(shell $(UNAME) -m)
else
PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
endif
OS_ARCH:=$(PROC_ARCH)
SLASH_JAVA = J: SLASH_JAVA = J:
EXESUFFIX = .exe GETMIXEDPATH = cygpath -m -s
# These need to be different depending on MKS or CYGWIN
ifeq ($(findstring cygdrive,$(shell ($(CD) C:/ && $(PWD)))), )
GETMIXEDPATH = dosname -s
OS_VERSION := $(shell $(UNAME) -r)
else
GETMIXEDPATH = cygpath -m -s
OS_VERSION := $(shell $(UNAME) -s | $(CUT) -d'-' -f2)
endif
endif
# Only want major and minor numbers from os version
OS_VERSION := $(shell $(ECHO) "$(OS_VERSION)" | $(CUT) -d'.' -f1,2)
# Name to use for x86_64 arch (historically amd64, but should change someday)
OS_ARCH_X64_NAME:=amd64
#OS_ARCH_X64_NAME:=x64
# Alternate arch names (in case this arch is known by a second name)
# PROBLEM_LISTS may use either name.
OS_ARCH2-amd64:=x64
#OS_ARCH2-x64:=amd64
# Try and use the arch names consistently
OS_ARCH:=$(patsubst x64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst X64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst AMD64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst amd64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst x86_64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst 8664,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst EM64T,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst em64t,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst intel64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst Intel64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst INTEL64,$(OS_ARCH_X64_NAME),$(OS_ARCH))
OS_ARCH:=$(patsubst IA64,ia64,$(OS_ARCH))
OS_ARCH:=$(patsubst X86,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst x86,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst i386,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst i486,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst i686,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst 386,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst 486,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst 586,i586,$(OS_ARCH))
OS_ARCH:=$(patsubst 686,i586,$(OS_ARCH))
# Default ARCH_DATA_MODEL settings
ARCH_DATA_MODEL-i586 = 32
ARCH_DATA_MODEL-$(OS_ARCH_X64_NAME) = 64
ARCH_DATA_MODEL-ia64 = 64
ARCH_DATA_MODEL-sparc = 32
ARCH_DATA_MODEL-sparcv9 = 64
# If ARCH_DATA_MODEL is not defined, try and pick a reasonable default
ifndef ARCH_DATA_MODEL
ARCH_DATA_MODEL:=$(ARCH_DATA_MODEL-$(OS_ARCH))
endif
ifndef ARCH_DATA_MODEL
ARCH_DATA_MODEL=32
endif
# Platform directory name
PLATFORM_OS = $(OS_NAME)-$(OS_ARCH)
# Check ARCH_DATA_MODEL, adjust OS_ARCH accordingly on solaris
ARCH_DATA_MODEL_ERROR= \
ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) cannot be used with $(PLATFORM_OS)
ifeq ($(ARCH_DATA_MODEL),64)
ifeq ($(PLATFORM_OS),solaris-i586)
OS_ARCH=$(OS_ARCH_X64_NAME)
endif
ifeq ($(PLATFORM_OS),solaris-sparc)
OS_ARCH=sparcv9
endif
ifeq ($(OS_ARCH),i586)
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)")
endif
ifeq ($(OS_ARCH),sparc)
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)")
endif
else else
ifeq ($(ARCH_DATA_MODEL),32) # Location of developer shared files
ifeq ($(OS_ARCH),$(OS_ARCH_X64_NAME)) SLASH_JAVA = /java
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)")
endif
ifeq ($(OS_ARCH),ia64)
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)")
endif
ifeq ($(OS_ARCH),sparcv9)
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)")
endif
else
x:=$(warning "WARNING: $(ARCH_DATA_MODEL_ERROR)")
endif
endif
# Alternate OS_ARCH name (defaults to OS_ARCH) GETMIXEDPATH=$(ECHO)
OS_ARCH2:=$(OS_ARCH2-$(OS_ARCH))
ifeq ($(OS_ARCH2),)
OS_ARCH2:=$(OS_ARCH)
endif endif
# Root of this test area (important to use full paths in some places) # Root of this test area (important to use full paths in some places)
...@@ -206,17 +77,18 @@ TEST_ROOT := $(shell $(PWD)) ...@@ -206,17 +77,18 @@ TEST_ROOT := $(shell $(PWD))
# Root of all test results # Root of all test results
ifdef ALT_OUTPUTDIR ifdef ALT_OUTPUTDIR
ABS_OUTPUTDIR = $(ALT_OUTPUTDIR) ABS_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD))
else else
ABS_OUTPUTDIR = $(TEST_ROOT)/../build/$(PLATFORM_OS) ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD))
endif endif
ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR)
ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR)
# Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)
ifndef PRODUCT_HOME ifndef PRODUCT_HOME
# Try to use j2sdk-image if it exists # Try to use j2sdk-image if it exists
ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/j2sdk-image ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/j2sdk-image
PRODUCT_HOME := \ PRODUCT_HOME := \
$(shell \ $(shell \
if [ -d $(ABS_JDK_IMAGE) ] ; then \ if [ -d $(ABS_JDK_IMAGE) ] ; then \
...@@ -240,30 +112,11 @@ ifdef JPRT_PRODUCT_VM_ARGS ...@@ -240,30 +112,11 @@ ifdef JPRT_PRODUCT_VM_ARGS
JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS) JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS)
endif endif
# Check JAVA_ARGS arguments based on ARCH_DATA_MODEL etc.
ifeq ($(OS_NAME),solaris)
D64_ERROR_MESSAGE=Mismatch between ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) and use of -d64 in JAVA_ARGS=$(JAVA_ARGS)
ifeq ($(ARCH_DATA_MODEL),32)
ifneq ($(findstring -d64,$(JAVA_ARGS)),)
x:=$(warning "WARNING: $(D64_ERROR_MESSAGE)")
endif
endif
ifeq ($(ARCH_DATA_MODEL),64)
ifeq ($(findstring -d64,$(JAVA_ARGS)),)
x:=$(warning "WARNING: $(D64_ERROR_MESSAGE)")
endif
endif
endif
# Macro to run make and set the shared library permissions
define SharedLibraryPermissions
$(MAKE) SHARED_LIBRARY_DIR=$1 UNIQUE_DIR=$@ shared_library_permissions
endef
# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
ifdef JPRT_ARCHIVE_BUNDLE ifdef JPRT_ARCHIVE_BUNDLE
ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
else
ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
endif endif
# How to create the test bundle (pass or fail, we want to create this) # How to create the test bundle (pass or fail, we want to create this)
...@@ -272,13 +125,15 @@ ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ ...@@ -272,13 +125,15 @@ ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \
&& $(CD) $(ABS_TEST_OUTPUT_DIR) \ && $(CD) $(ABS_TEST_OUTPUT_DIR) \
&& $(CHMOD) -R a+r . \ && $(CHMOD) -R a+r . \
&& $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport/text/summary.txt
# important results files
SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt")
STATS_TXT_NAME = Stats.txt STATS_TXT_NAME = Stats.txt
STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/$(STATS_TXT_NAME) STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/$(STATS_TXT_NAME)")
RUNLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/runlist.txt RUNLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/runlist.txt")
PASSLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/passlist.txt PASSLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/passlist.txt")
FAILLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/faillist.txt FAILLIST = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/faillist.txt")
EXITCODE = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/exitcode.txt EXITCODE = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/exitcode.txt")
TESTEXIT = \ TESTEXIT = \
if [ ! -s $(EXITCODE) ] ; then \ if [ ! -s $(EXITCODE) ] ; then \
...@@ -316,8 +171,8 @@ BUNDLE_UP_AND_EXIT = \ ...@@ -316,8 +171,8 @@ BUNDLE_UP_AND_EXIT = \
runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ runc="`$(CAT) $(RUNLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \
exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ exclc="FIXME CODETOOLS-7900176"; \
$(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc} excluded=$${exclc}" \ $(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc}" \
>> $(STATS_TXT); \ >> $(STATS_TXT); \
else \ else \
$(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \
...@@ -336,9 +191,24 @@ all: jdk_default ...@@ -336,9 +191,24 @@ all: jdk_default
@$(ECHO) "Testing completed successfully" @$(ECHO) "Testing completed successfully"
# Prep for output # Prep for output
# Change execute permissions on shared library files.
# Files in repositories should never have execute permissions, but
# there are some tests that have pre-built shared libraries, and these
# windows dll files must have execute permission. Adding execute
# permission may happen automatically on windows when using certain
# versions of mercurial but it cannot be guaranteed. And blindly
# adding execute permission might be seen as a mercurial 'change', so
# we avoid adding execute permission to repository files. But testing
# from a plain source tree needs the chmod a+rx. Applying the chmod to
# all shared libraries not just dll files. And with CYGWIN and sshd
# service, you may need CYGWIN=ntsec for this to work.
prep: prep:
@$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
@$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)`
@if [ ! -d $(TEST_ROOT)/../.hg ] ; then \
$(FIND) $(TEST_ROOT) \( -name \*.dll -o -name \*.DLL -o -name \*.so \) \
-exec $(CHMOD) a+rx {} \; ; \
fi
# Cleanup # Cleanup
clean: clean:
...@@ -357,50 +227,21 @@ ifndef JT_HOME ...@@ -357,50 +227,21 @@ ifndef JT_HOME
endif endif
endif endif
# Expect JPRT to set TESTDIRS to the jtreg test dirs # Problematic tests to be excluded
ifndef TESTDIRS PROBLEM_LISTS=$(call MixedDirs,$(wildcard ProblemList.txt closed/ProblemList.txt))
TESTDIRS = demo
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 # Create exclude list for this platform and arch
ifdef NO_EXCLUDES ifdef NO_EXCLUDES
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES) JTREG_EXCLUSIONS =
@$(ECHO) "NOTHING_EXCLUDED" > $@
else else
$(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES) JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%)
@$(RM) $@ $@.temp1 $@.temp2
@(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all' ) ;\
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)' ) ;\
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)' ) ;\
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)' ) ;\
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\
($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\
($(ECHO) "#") ;\
) | $(SED) -e 's@^[\ ]*@@' \
| $(EGREP) -v '^#' > $@.temp1
@for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \
( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \
done
@$(ECHO) "# at least one line" >> $@.temp2
@( $(EGREP) -v '^#' $@.temp2 ; true ) > $@
@$(ECHO) "Excluding list contains `$(EXPAND) $@ | $(WC) -l` items"
endif endif
# Select list of directories that exist # convert list of directories to dos paths
define TestDirs define MixedDirs
$(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i})) $(foreach i,$1,$(shell $(GETMIXEDPATH) "${i}"))
endef
# Running batches of tests with or without agentvm
define RunBatch
$(ECHO) "Running tests: $?"
$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" UNIQUE_DIR=$@ jtreg_tests
endef endef
define SummaryInfo define SummaryInfo
$(ECHO) "########################################################" $(ECHO) "########################################################"
$(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME)) $(CAT) $(?:%=$(ABS_TEST_OUTPUT_DIR)/%/$(STATS_TXT_NAME))
...@@ -409,178 +250,11 @@ endef ...@@ -409,178 +250,11 @@ endef
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Batches of tests (somewhat arbitrary assigments to jdk_* targets) jdk_%:
# NOTE: These *do not* run the same tests as make/jprt.properties $(ECHO) "Running tests: $@"
JDK_DEFAULT_TARGETS = for each in $@; do \
JDK_ALL_TARGETS = $(MAKE) -j 1 TEST_SELECTION=":$$each" UNIQUE_DIR=$$each jtreg_tests; \
done
JDK_ALL_TARGETS += jdk_awt
jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \
javax/imageio javax/print sun/pisces)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_beans1
JDK_DEFAULT_TARGETS += jdk_beans1
jdk_beans1: $(call TestDirs, \
java/beans/beancontext java/beans/PropertyChangeSupport \
java/beans/Introspector java/beans/Performance \
java/beans/VetoableChangeSupport java/beans/Statement)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_beans2
jdk_beans2: $(call TestDirs, \
java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \
java/beans/PropertyEditor)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_beans3
jdk_beans3: $(call TestDirs, java/beans/XMLEncoder)
$(call RunBatch)
# All beans tests
jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3
@$(SummaryInfo)
JDK_ALL_TARGETS += jdk_io
JDK_DEFAULT_TARGETS += jdk_io
jdk_io: $(call TestDirs, java/io)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_lang
JDK_DEFAULT_TARGETS += jdk_lang
jdk_lang: $(call TestDirs, java/lang sun/invoke sun/misc sun/reflect vm)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_jmx
jdk_jmx: $(call TestDirs, javax/management com/sun/jmx)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_management
jdk_management: $(call TestDirs, com/sun/management sun/management)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_math
JDK_DEFAULT_TARGETS += jdk_math
jdk_math: $(call TestDirs, java/math)
$(call RunBatch)
JDK_DEFAULT_TARGETS += jdk_time
jdk_time: $(call TestDirs, java/time)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_other
JDK_DEFAULT_TARGETS += jdk_other
jdk_other: $(call TestDirs, \
demo/jvmti demo/zipfs sample \
javax/naming com/sun/jndi \
javax/script \
java/sql javax/sql \
javax/smartcardio \
javax/xml/jaxp \
javax/xml/soap \
javax/xml/ws com/sun/internal/ws com/sun/org/glassfish \
jdk/asm \
jdk/lambda \
com/sun/org/apache/xerces \
com/sun/corba \
com/sun/tracing \
sun/usagetracker \
misc)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_net
JDK_DEFAULT_TARGETS += jdk_net
jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net)
$(call RunBatch)
jdk_nio: $(call TestDirs, java/nio sun/nio com/oracle/nio)
$(call SharedLibraryPermissions,java/nio/channels)
$(call RunBatch)
jdk_sctp: $(call TestDirs, com/sun/nio/sctp)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_rmi
jdk_rmi: $(call TestDirs, java/rmi sun/rmi javax/rmi/ssl)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_security1
JDK_DEFAULT_TARGETS += jdk_security1
jdk_security1: $(call TestDirs, java/security)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_security2
jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_security3
jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \
sun/security com/sun/org/apache/xml/internal/security \
com/oracle/security)
$(call SharedLibraryPermissions,sun/security)
$(call RunBatch)
# All security tests
jdk_security: jdk_security1 jdk_security2 jdk_security3
@$(SummaryInfo)
JDK_ALL_TARGETS += jdk_sound
jdk_sound: $(call TestDirs, javax/sound)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_swing
jdk_swing: $(call TestDirs, javax/swing sun/java2d \
demo/jfc com/sun/java/swing)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_text
JDK_DEFAULT_TARGETS += jdk_text
jdk_text: $(call TestDirs, java/text sun/text)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_jdi
jdk_jdi: $(call TestDirs, com/sun/jdi)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_tools
jdk_tools: $(call TestDirs, com/sun/tools sun/jvmstat sun/tools tools)
$(call SharedLibraryPermissions,tools/launcher)
$(call RunBatch)
ifdef OPENJDK
jdk_jfr:
else
JDK_ALL_TARGETS += jdk_jfr
jdk_jfr: $(call TestDirs, com/oracle/jfr)
$(call RunBatch)
endif
JDK_ALL_TARGETS += jdk_util
JDK_DEFAULT_TARGETS += jdk_util
jdk_util: $(call TestDirs, java/util sun/util)
$(call RunBatch)
# ------------------------------------------------------------------
# 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)
@$(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
# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.all.test.targets
jdk_all: $(JDK_ALL_TARGETS)
@$(SummaryInfo)
# These are all phony targets
PHONY_LIST += $(JDK_ALL_TARGETS) jdk_default jdk_core jdk_all
# ------------------------------------------------------------------ # ------------------------------------------------------------------
...@@ -625,44 +299,23 @@ JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) ...@@ -625,44 +299,23 @@ JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION)
$(JTREG): $(JT_HOME) $(JTREG): $(JT_HOME)
# Run jtreg # Run jtreg
jtreg_tests: prep $(PRODUCT_HOME) $(JTREG) $(EXCLUDELIST) jtreg_tests: prep $(PRODUCT_HOME) $(JTREG)
@$(EXPAND) $(EXCLUDELIST) \
| $(CUT) -d' ' -f1 \
| $(SED) -e 's@^@Excluding: @'
( \ ( \
( JT_HOME=$(shell $(GETMIXEDPATH) "$(JT_HOME)"); \ ( JT_HOME=$(shell $(GETMIXEDPATH) "$(JT_HOME)"); \
export JT_HOME; \ export JT_HOME; \
$(shell $(GETMIXEDPATH) "$(JTREG)") \ $(shell $(GETMIXEDPATH) "$(JTREG)") \
$(JTREG_BASIC_OPTIONS) \ $(JTREG_BASIC_OPTIONS) \
-r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \ -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \
-w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \ -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \
-jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \
-exclude:$(shell $(GETMIXEDPATH) "$(EXCLUDELIST)") \ $(JTREG_EXCLUSIONS) \
$(JTREG_TEST_OPTIONS) \ $(JTREG_TEST_OPTIONS) \
$(TESTDIRS) \ $(TEST_SELECTION) \
) ; $(BUNDLE_UP_AND_EXIT) \ ) ; \
$(BUNDLE_UP_AND_EXIT) \
) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT) ) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT)
# Rule that may change execute permissions on shared library files. PHONY_LIST += jtreg_tests
# Files in repositories should never have execute permissions, but there
# are some tests that have pre-built shared libraries, and these windows
# dll files must have execute permission. Adding execute permission
# may happen automatically on windows when using certain versions of mercurial
# but it cannot be guaranteed. And blindly adding execute permission might
# be seen as a mercurial 'change', so we avoid adding execute permission to
# repository files. But testing from a plain source tree needs the chmod a+rx.
# Used on select directories and applying the chmod to all shared libraries
# not just dll files. On windows, this may not work with MKS if the files
# were installed with CYGWIN unzip or untar (MKS chmod may not do anything).
# And with CYGWIN and sshd service, you may need CYGWIN=ntsec for this to work.
#
shared_library_permissions: $(SHARED_LIBRARY_DIR)
if [ ! -d $(TEST_ROOT)/../.hg ] ; then \
$(FIND) $< \( -name \*.dll -o -name \*.DLL -o -name \*.so \) \
-exec $(CHMOD) a+rx {} \; ; \
fi
PHONY_LIST += jtreg_tests shared_library_permissions
################################################################ ################################################################
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或