infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

8166648: jib make run-test for langtools results in intermittent failures on windows-x86

Browse Source 
Reviewed-by: erikj, jjg
This commit is contained in:
Tim Bell 2016-10-07 20:48:39 -07:00
parent 6fef223c3f
commit ece1def9ae
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
langtools/test/Makefile
View File

@ -157,6 +157,15 @@ ifdef TESTBOOTCLASSPATH
-refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH)
endif
ifeq ($(ARCH_DATA_MODEL),32)
# Set the GC options for test vms
JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC
JTREG_OPTIONS += $(JTREG_GC_OPTION)
endif
# Set the max memory for jtreg target test JVMs
JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx768m
JTREG_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION)
ifdef EXTRA_JTREG_OPTIONS
JTREG_OPTIONS += $(EXTRA_JTREG_OPTIONS)
endif
@ -304,8 +313,6 @@ jtreg-tests: check-jtreg FRC
$(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt
@mkdir -p $(JTREG_OUTPUT_DIR)
JT_JAVA=$(JT_JAVA) $(JTREG) \
-J-Xmx512m \
-vmoption:-Xmx768m \
-a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \
-r:$(JTREG_OUTPUT_DIR)/JTreport \
-w:$(JTREG_OUTPUT_DIR)/JTwork \