equal
deleted
inserted
replaced
263 done |
263 done |
264 |
264 |
265 # ------------------------------------------------------------------ |
265 # ------------------------------------------------------------------ |
266 |
266 |
267 ifdef CONCURRENCY |
267 ifdef CONCURRENCY |
268 EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) |
268 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
|
269 endif |
|
270 ifdef EXTRA_JTREG_OPTIONS |
|
271 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
269 endif |
272 endif |
270 |
273 |
271 # Default JTREG to run |
274 # Default JTREG to run |
272 JTREG = $(JT_HOME)/bin/jtreg |
275 JTREG = $(JT_HOME)/bin/jtreg |
273 # run in agentvm mode |
276 # run in agentvm mode |
288 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
291 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
289 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
292 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
290 # Set the max memory for jtreg control vm |
293 # Set the max memory for jtreg control vm |
291 JTREG_MEMORY_OPTION = -J-Xmx512m |
294 JTREG_MEMORY_OPTION = -J-Xmx512m |
292 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
295 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
293 # Add any extra options |
|
294 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
|
295 # Set other vm and test options |
296 # Set other vm and test options |
296 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
297 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
297 # Set the GC options for test vms |
298 # Set the GC options for test vms |
298 #JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
299 #JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
299 #JTREG_TEST_OPTIONS += $(JTREG_GC_OPTION) |
300 #JTREG_TEST_OPTIONS += $(JTREG_GC_OPTION) |