43 TEST_OPTS := VM_OPTIONS=$(TEST_VM_OPTS) |
43 TEST_OPTS := VM_OPTIONS=$(TEST_VM_OPTS) |
44 endif |
44 endif |
45 endif |
45 endif |
46 |
46 |
47 $(eval $(call ParseKeywordVariable, TEST_OPTS, \ |
47 $(eval $(call ParseKeywordVariable, TEST_OPTS, \ |
48 SINGLE_KEYWORDS := JOBS TIMEOUT GENERATE_CDS_ARCHIVE, \ |
48 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR GENERATE_CDS_ARCHIVE, \ |
49 STRING_KEYWORDS := VM_OPTIONS, \ |
49 STRING_KEYWORDS := VM_OPTIONS, \ |
50 )) |
50 )) |
51 |
51 |
52 # Helper function to propagate TEST_OPTS values. |
52 # Helper function to propagate TEST_OPTS values. |
53 # |
53 # |
154 |
154 |
155 $(eval $(call SetTestOpt,VM_OPTIONS,JTREG)) |
155 $(eval $(call SetTestOpt,VM_OPTIONS,JTREG)) |
156 $(eval $(call SetTestOpt,VM_OPTIONS,GTEST)) |
156 $(eval $(call SetTestOpt,VM_OPTIONS,GTEST)) |
157 |
157 |
158 $(eval $(call SetTestOpt,JOBS,JTREG)) |
158 $(eval $(call SetTestOpt,JOBS,JTREG)) |
159 $(eval $(call SetTestOpt,TIMEOUT,JTREG)) |
159 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) |
160 endif |
160 endif |
161 |
161 |
162 $(eval $(call ParseKeywordVariable, JTREG, \ |
162 $(eval $(call ParseKeywordVariable, JTREG, \ |
163 SINGLE_KEYWORDS := JOBS TIMEOUT TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM \ |
163 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM \ |
164 EXTRA_PROBLEM_LISTS KEYWORDS, \ |
164 EXTRA_PROBLEM_LISTS KEYWORDS, \ |
165 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \ |
165 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \ |
166 )) |
166 )) |
167 |
167 |
168 ifneq ($(JTREG), ) |
168 ifneq ($(JTREG), ) |
519 |
519 |
520 # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since |
520 # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since |
521 # we may end up with a lot of JVM's |
521 # we may end up with a lot of JVM's |
522 $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS)) |
522 $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS)) |
523 |
523 |
524 $$(call PrintVar, TEST_OPTS_TIMEOUT) |
524 JTREG_TIMEOUT_FACTOR ?= 4 |
525 $$(call PrintVar, JTREG_TIMEOUT) |
|
526 JTREG_TIMEOUT ?= 4 |
|
527 JTREG_VERBOSE ?= fail,error,summary |
525 JTREG_VERBOSE ?= fail,error,summary |
528 JTREG_RETAIN ?= fail,error |
526 JTREG_RETAIN ?= fail,error |
529 |
527 |
530 ifneq ($$($1_JTREG_MAX_MEM), 0) |
528 ifneq ($$($1_JTREG_MAX_MEM), 0) |
531 $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM) |
529 $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM) |
532 $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM) |
530 $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM) |
533 endif |
531 endif |
534 |
532 |
535 $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \ |
533 $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \ |
536 -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \ |
534 -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \ |
537 -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \ |
535 -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \ |
538 -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) |
536 -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) |
539 |
537 |
540 $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet |
538 $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet |
541 |
539 |
542 # Make it possible to specify the JIB_DATA_DIR for tests using the |
540 # Make it possible to specify the JIB_DATA_DIR for tests using the |