equal
deleted
inserted
replaced
304 ifdef TESTDIRS |
304 ifdef TESTDIRS |
305 TEST_SELECTION = $(TESTDIRS) |
305 TEST_SELECTION = $(TESTDIRS) |
306 endif |
306 endif |
307 |
307 |
308 ifdef CONCURRENCY |
308 ifdef CONCURRENCY |
309 EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) |
309 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
|
310 endif |
|
311 ifdef EXTRA_JTREG_OPTIONS |
|
312 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
310 endif |
313 endif |
311 |
314 |
312 # Default JTREG to run |
315 # Default JTREG to run |
313 JTREG = $(JT_HOME)/bin/jtreg |
316 JTREG = $(JT_HOME)/bin/jtreg |
314 |
317 |
324 JTREG_IGNORE_OPTION = -ignore:quiet |
327 JTREG_IGNORE_OPTION = -ignore:quiet |
325 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
328 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
326 # Multiply by 4 the timeout factor |
329 # Multiply by 4 the timeout factor |
327 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
330 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
328 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
331 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
329 # Add any extra options |
|
330 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
|
331 # Set other vm and test options |
332 # Set other vm and test options |
332 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
333 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
333 |
334 |
334 # Option to tell jtreg to not run tests marked with "ignore" |
335 # Option to tell jtreg to not run tests marked with "ignore" |
335 ifeq ($(PLATFORM), windows) |
336 ifeq ($(PLATFORM), windows) |