equal
deleted
inserted
replaced
299 ifdef TESTDIRS |
299 ifdef TESTDIRS |
300 TEST_SELECTION = $(TESTDIRS) |
300 TEST_SELECTION = $(TESTDIRS) |
301 endif |
301 endif |
302 |
302 |
303 ifdef CONCURRENCY |
303 ifdef CONCURRENCY |
304 EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) |
304 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
|
305 endif |
|
306 ifdef EXTRA_JTREG_OPTIONS |
|
307 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
305 endif |
308 endif |
306 |
309 |
307 # Default JTREG to run |
310 # Default JTREG to run |
308 JTREG = $(JT_HOME)/bin/jtreg |
311 JTREG = $(JT_HOME)/bin/jtreg |
309 # run in agentvm mode |
312 # run in agentvm mode |
326 # Set the max memory for jtreg control vm |
329 # Set the max memory for jtreg control vm |
327 JTREG_MEMORY_OPTION = -J-Xmx512m |
330 JTREG_MEMORY_OPTION = -J-Xmx512m |
328 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
331 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
329 # Give tests access to JT_JAVA, see JDK-8141609 |
332 # Give tests access to JT_JAVA, see JDK-8141609 |
330 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
333 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
331 # Add any extra options |
|
332 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
|
333 # Set other vm and test options |
334 # Set other vm and test options |
334 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
335 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
335 # Set the GC options for test vms |
336 # Set the GC options for test vms |
336 #JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
337 #JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
337 #JTREG_TEST_OPTIONS += $(JTREG_GC_OPTION) |
338 #JTREG_TEST_OPTIONS += $(JTREG_GC_OPTION) |