96 endif |
96 endif |
97 |
97 |
98 JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler |
98 JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler |
99 JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar |
99 JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar |
100 |
100 |
|
101 JTREG_FAILURE_HANDLER_TIMEOUT ?= 0 |
|
102 |
101 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) |
103 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) |
102 JTREG_FAILURE_HANDLER_OPTIONS := \ |
104 JTREG_FAILURE_HANDLER_OPTIONS := \ |
103 -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ |
105 -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ |
104 -observerDir:$(JTREG_FAILURE_HANDLER) \ |
106 -observerDir:$(JTREG_FAILURE_HANDLER) \ |
105 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
107 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
106 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
108 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
107 -timeoutHandlerTimeout:0 |
109 -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT) |
108 endif |
110 endif |
109 |
111 |
110 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ |
112 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ |
111 $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher)) |
113 $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher)) |
112 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \ |
114 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \ |
183 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ |
185 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ |
184 $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ |
186 $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ |
185 ) |
187 ) |
186 $$(call ExecuteWithLog, $$@.check, \ |
188 $$(call ExecuteWithLog, $$@.check, \ |
187 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ |
189 $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ |
188 $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions \ |
190 $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \ |
189 -XX:+PrintAOT -XX:+UseAOTStrictLoading \ |
191 -XX:+PrintAOT -XX:+UseAOTStrictLoading \ |
190 -XX:AOTLibrary=$$@ -version \ |
192 -XX:AOTLibrary=$$@ -version \ |
191 > $$@.verify-aot \ |
193 > $$@.verify-aot \ |
192 ) |
194 ) |
193 |
195 |
|
196 $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions |
194 $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) |
197 $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) |
195 $1_AOT_TARGETS += $$($1_AOT_LIB) |
198 $1_AOT_TARGETS += $$($1_AOT_LIB) |
196 endef |
199 endef |
197 |
200 |
198 # Parameter 1 is the name of the rule. |
201 # Parameter 1 is the name of the rule. |
273 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG)) |
276 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG)) |
274 $(eval $(call SetTestOpt,AOT_MODULES,JTREG)) |
277 $(eval $(call SetTestOpt,AOT_MODULES,JTREG)) |
275 |
278 |
276 $(eval $(call SetTestOpt,JOBS,JTREG)) |
279 $(eval $(call SetTestOpt,JOBS,JTREG)) |
277 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) |
280 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) |
|
281 $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG)) |
278 |
282 |
279 $(eval $(call ParseKeywordVariable, JTREG, \ |
283 $(eval $(call ParseKeywordVariable, JTREG, \ |
280 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \ |
284 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ |
281 MAX_MEM, \ |
285 TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS, \ |
282 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ |
286 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ |
283 EXTRA_PROBLEM_LISTS AOT_MODULES, \ |
287 EXTRA_PROBLEM_LISTS AOT_MODULES, \ |
284 )) |
288 )) |
285 |
289 |
286 ifneq ($(JTREG), ) |
290 ifneq ($(JTREG), ) |
826 else |
830 else |
827 JTREG_TIMEOUT_FACTOR ?= 4 |
831 JTREG_TIMEOUT_FACTOR ?= 4 |
828 endif |
832 endif |
829 JTREG_VERBOSE ?= fail,error,summary |
833 JTREG_VERBOSE ?= fail,error,summary |
830 JTREG_RETAIN ?= fail,error |
834 JTREG_RETAIN ?= fail,error |
|
835 JTREG_RUN_PROBLEM_LISTS ?= false |
831 |
836 |
832 ifneq ($$($1_JTREG_MAX_MEM), 0) |
837 ifneq ($$($1_JTREG_MAX_MEM), 0) |
833 $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM) |
838 $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM) |
834 $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM) |
839 $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM) |
835 endif |
840 endif |
863 |
868 |
864 ifneq ($$($1_JTREG_NATIVEPATH), ) |
869 ifneq ($$($1_JTREG_NATIVEPATH), ) |
865 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH) |
870 $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH) |
866 endif |
871 endif |
867 |
872 |
|
873 ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true) |
|
874 JTREG_PROBLEM_LIST_PREFIX := -match: |
|
875 else |
|
876 JTREG_PROBLEM_LIST_PREFIX := -exclude: |
|
877 endif |
|
878 |
868 ifneq ($$($1_JTREG_PROBLEM_LIST), ) |
879 ifneq ($$($1_JTREG_PROBLEM_LIST), ) |
869 $1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$($1_JTREG_PROBLEM_LIST)) |
880 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST)) |
870 endif |
881 endif |
871 |
882 |
872 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), ) |
883 ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), ) |
873 # Accept both absolute paths as well as relative to the current test root. |
884 # Accept both absolute paths as well as relative to the current test root. |
874 $1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$(wildcard \ |
885 $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \ |
875 $$(JTREG_EXTRA_PROBLEM_LISTS) \ |
886 $$(JTREG_EXTRA_PROBLEM_LISTS) \ |
876 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \ |
887 $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \ |
877 )) |
888 )) |
878 endif |
889 endif |
879 |
890 |
880 ifneq ($$(JIB_HOME), ) |
891 ifneq ($$(JIB_HOME), ) |
881 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME) |
892 $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME) |
882 endif |
893 endif |
883 |
894 |
884 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=${TEST_IMAGE_DIR}/hotspot/jtreg/graal |
895 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) |
|
896 $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=$(TEST_IMAGE_DIR)/hotspot/jtreg/graal |
885 |
897 |
886 ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), ) |
898 ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), ) |
887 $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)" |
899 $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)" |
888 endif |
900 endif |
889 |
901 |
1197 JCOV_REPORT_TITLE := JDK code coverage report<br/> |
1209 JCOV_REPORT_TITLE := JDK code coverage report<br/> |
1198 ifneq ($(JCOV_FILTERS), ) |
1210 ifneq ($(JCOV_FILTERS), ) |
1199 JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br> |
1211 JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br> |
1200 endif |
1212 endif |
1201 JCOV_REPORT_TITLE += Tests: $(TEST) |
1213 JCOV_REPORT_TITLE += Tests: $(TEST) |
1202 |
1214 |
1203 jcov-gen-report: jcov-stop-grabber |
1215 jcov-gen-report: jcov-stop-grabber |
1204 $(call LogWarn, Generating JCov report ...) |
1216 $(call LogWarn, Generating JCov report ...) |
1205 $(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \ |
1217 $(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \ |
1206 `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \ |
1218 `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \ |
1207 $(JCOV_FILTERS) \ |
1219 $(JCOV_FILTERS) \ |