equal
deleted
inserted
replaced
655 JTREG_IGNORE_OPTION = -ignore:quiet |
655 JTREG_IGNORE_OPTION = -ignore:quiet |
656 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
656 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION) |
657 # Multiple by 4 the timeout numbers |
657 # Multiple by 4 the timeout numbers |
658 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
658 JTREG_TIMEOUT_OPTION = -timeoutFactor:4 |
659 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
659 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) |
660 # Boost the max memory for jtreg to avoid gc thrashing |
660 # Set the max memory for jtreg control vm |
661 JTREG_MEMORY_OPTION = -J-Xmx512m |
661 JTREG_MEMORY_OPTION = -J-Xmx512m |
662 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
662 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) |
|
663 # Set the max memory for jtreg target test vms |
|
664 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m |
|
665 JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
663 |
666 |
664 # Make sure jtreg exists |
667 # Make sure jtreg exists |
665 $(JTREG): $(JT_HOME) |
668 $(JTREG): $(JT_HOME) |
666 |
669 |
667 # Run jtreg |
670 # Run jtreg |