283 # Parse control variables
284 ################################################################################
285
286 ifneq ($(TEST_OPTS), )
287 # Inform the user
288 $(info Running tests using TEST_OPTS control variable '$(TEST_OPTS)')
289 endif
290
291 ### Jtreg
292
293 $(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
294 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
295 $(eval $(call SetTestOpt,AOT_MODULES,JTREG))
296
297 $(eval $(call SetTestOpt,JOBS,JTREG))
298 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
299 $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
300
301 $(eval $(call ParseKeywordVariable, JTREG, \
302 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
303 TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
304 RETRY_COUNT, \
305 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
306 EXTRA_PROBLEM_LISTS AOT_MODULES, \
307 ))
308
309 ifneq ($(JTREG), )
310 # Inform the user
311 $(info Running tests using JTREG control variable '$(JTREG)')
312 endif
313
314 ### Gtest
315
316 $(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
317 $(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
318 $(eval $(call SetTestOpt,AOT_MODULES,GTEST))
319
320 $(eval $(call ParseKeywordVariable, GTEST, \
321 SINGLE_KEYWORDS := REPEAT, \
322 STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
323 ))
835 $1_JTREG_PROBLEM_LIST := $$(filter $$($1_TEST_ROOT)%, $$($1_JTREG_PROBLEM_LIST))
836
837 ifneq ($(TEST_JOBS), 0)
838 $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(TEST_JOBS)))
839 else
840 $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS)))
841 endif
842
843 # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
844 # we may end up with a lot of JVM's
845 $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
846
847 # SPARC is in general slower per core so need to scale up timeouts a bit.
848 ifeq ($(call isTargetCpuArch, sparc), true)
849 JTREG_TIMEOUT_FACTOR ?= 8
850 else
851 JTREG_TIMEOUT_FACTOR ?= 4
852 endif
853 JTREG_VERBOSE ?= fail,error,summary
854 JTREG_RETAIN ?= fail,error
855 JTREG_RUN_PROBLEM_LISTS ?= false
856 JTREG_RETRY_COUNT ?= 0
857
858 ifneq ($$($1_JTREG_MAX_MEM), 0)
859 $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM)
860 $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM)
861 endif
862
863 $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
864 -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
865 -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
866 -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
867
868 $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
869
870 # Make it possible to specify the JIB_DATA_DIR for tests using the
871 # JIB Artifact resolver
872 $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
873 # Some tests needs to find a boot JDK using the JDK8_HOME variable.
874 $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
875 # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
876 # symbol lookup in hserr files
877 ifeq ($$(call isTargetOs, windows), true)
|
283 # Parse control variables
284 ################################################################################
285
286 ifneq ($(TEST_OPTS), )
287 # Inform the user
288 $(info Running tests using TEST_OPTS control variable '$(TEST_OPTS)')
289 endif
290
291 ### Jtreg
292
293 $(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
294 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
295 $(eval $(call SetTestOpt,AOT_MODULES,JTREG))
296
297 $(eval $(call SetTestOpt,JOBS,JTREG))
298 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
299 $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
300
301 $(eval $(call ParseKeywordVariable, JTREG, \
302 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
303 TEST_MODE ASSERT VERBOSE RETAIN MAIN_WRAPPER MAX_MEM RUN_PROBLEM_LISTS \
304 RETRY_COUNT, \
305 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
306 EXTRA_PROBLEM_LISTS AOT_MODULES, \
307 ))
308
309 ifneq ($(JTREG), )
310 # Inform the user
311 $(info Running tests using JTREG control variable '$(JTREG)')
312 endif
313
314 ### Gtest
315
316 $(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
317 $(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
318 $(eval $(call SetTestOpt,AOT_MODULES,GTEST))
319
320 $(eval $(call ParseKeywordVariable, GTEST, \
321 SINGLE_KEYWORDS := REPEAT, \
322 STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
323 ))
835 $1_JTREG_PROBLEM_LIST := $$(filter $$($1_TEST_ROOT)%, $$($1_JTREG_PROBLEM_LIST))
836
837 ifneq ($(TEST_JOBS), 0)
838 $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(TEST_JOBS)))
839 else
840 $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS)))
841 endif
842
843 # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
844 # we may end up with a lot of JVM's
845 $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
846
847 # SPARC is in general slower per core so need to scale up timeouts a bit.
848 ifeq ($(call isTargetCpuArch, sparc), true)
849 JTREG_TIMEOUT_FACTOR ?= 8
850 else
851 JTREG_TIMEOUT_FACTOR ?= 4
852 endif
853 JTREG_VERBOSE ?= fail,error,summary
854 JTREG_RETAIN ?= fail,error
855 JTREG_MAIN_WRAPPER ?=
856 JTREG_RUN_PROBLEM_LISTS ?= false
857 JTREG_RETRY_COUNT ?= 0
858
859 ifneq ($$(JTREG_MAIN_WRAPPER), )
860 JT_HOME = $$(JT_HOME_MW)
861 $1_JTREG_BASIC_OPTIONS += -mainWrapper:$$(JTREG_MAIN_WRAPPER)
862 endif
863
864 ifneq ($$($1_JTREG_MAX_MEM), 0)
865 $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM)
866 $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM)
867 endif
868
869 $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
870 -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
871 -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
872 -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
873
874 $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
875
876 # Make it possible to specify the JIB_DATA_DIR for tests using the
877 # JIB Artifact resolver
878 $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
879 # Some tests needs to find a boot JDK using the JDK8_HOME variable.
880 $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
881 # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
882 # symbol lookup in hserr files
883 ifeq ($$(call isTargetOs, windows), true)
|