stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8157605: Can't set both CONCURRENCY and EXTRA_JTREG_OPTIONS when running tests

Browse Source 
Reviewed-by: tbell, erikj
This commit is contained in:
Staffan Larsen 2016-05-24 12:14:28 +02:00
parent 4d950890f2
commit e549e87431
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/test/Makefile
View File

@ -301,7 +301,10 @@ ifdef TESTDIRS
endif endif
ifdef CONCURRENCY ifdef CONCURRENCY
EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
endif
ifdef EXTRA_JTREG_OPTIONS
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
endif endif
# Default JTREG to run # Default JTREG to run
@ -328,8 +331,6 @@ JTREG_MEMORY_OPTION = -J-Xmx512m
JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
# Give tests access to JT_JAVA, see JDK-8141609 # Give tests access to JT_JAVA, see JDK-8141609
JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
# Add any extra options
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
# Set other vm and test options # Set other vm and test options
JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
# Set the GC options for test vms # Set the GC options for test vms