equal
deleted
inserted
replaced
300 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
300 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
301 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
301 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
302 # Set the max memory for jtreg control vm |
302 # Set the max memory for jtreg control vm |
303 JTREG_MEMORY_OPTION = -J-Xmx512m |
303 JTREG_MEMORY_OPTION = -J-Xmx512m |
304 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
304 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
|
305 # Give tests access to JT_JAVA, see JDK-8141609 |
|
306 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
305 # Add any extra options |
307 # Add any extra options |
306 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
308 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
307 # Set other vm and test options |
309 # Set other vm and test options |
308 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
310 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
309 # Set the GC options for test vms |
311 # Set the GC options for test vms |