368 ifndef USE_JTREG_SAMEVM |
368 ifndef USE_JTREG_SAMEVM |
369 USE_JTREG_SAMEVM=false |
369 USE_JTREG_SAMEVM=false |
370 endif |
370 endif |
371 # With samevm, you cannot use -javaoptions? |
371 # With samevm, you cannot use -javaoptions? |
372 ifeq ($(USE_JTREG_SAMEVM),true) |
372 ifeq ($(USE_JTREG_SAMEVM),true) |
373 EXTRA_JTREG_OPTIONS += -samevm $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%) |
373 JTREG_SAMEVM_OPTION = -samevm |
|
374 EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%) |
374 JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%) |
375 JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%) |
375 else |
376 else |
376 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
377 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
377 endif |
378 endif |
378 |
379 |
598 JTREG = $(JT_HOME)/win32/bin/jtreg |
599 JTREG = $(JT_HOME)/win32/bin/jtreg |
599 # Add any extra options (samevm etc.) |
600 # Add any extra options (samevm etc.) |
600 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
601 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
601 # Only run automatic tests |
602 # Only run automatic tests |
602 JTREG_BASIC_OPTIONS += -a |
603 JTREG_BASIC_OPTIONS += -a |
|
604 # Always turn on assertions |
|
605 JTREG_ASSERT_OPTION = -ea -esa |
|
606 JTREG_BASIC_OPTIONS += $(JTREG_ASSERT_OPTION) |
603 # Report details on all failed or error tests, times too |
607 # Report details on all failed or error tests, times too |
604 JTREG_BASIC_OPTIONS += -v:fail,error,time |
608 JTREG_BASIC_OPTIONS += -v:fail,error,time |
605 # Retain all files for failing tests |
609 # Retain all files for failing tests |
606 JTREG_BASIC_OPTIONS += -retain:fail,error |
610 JTREG_BASIC_OPTIONS += -retain:fail,error |
607 # Ignore tests are not run and completely silent about it |
611 # Ignore tests are not run and completely silent about it |
608 JTREG_BASIC_OPTIONS += -ignore:quiet |
612 JTREG_IGNORE_OPTION = -ignore:quiet |
|
613 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
609 # Multiple by 4 the timeout numbers |
614 # Multiple by 4 the timeout numbers |
610 JTREG_BASIC_OPTIONS += -timeoutFactor:4 |
615 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
|
616 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
611 # Boost the max memory for jtreg to avoid gc thrashing |
617 # Boost the max memory for jtreg to avoid gc thrashing |
612 JTREG_BASIC_OPTIONS += -J-Xmx512m |
618 JTREG_MEMORY_OPTION = -J-Xmx512m |
|
619 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
613 |
620 |
614 # Make sure jtreg exists |
621 # Make sure jtreg exists |
615 $(JTREG): $(JT_HOME) |
622 $(JTREG): $(JT_HOME) |
616 |
623 |
617 # Run jtreg |
624 # Run jtreg |