8157605: Can't set both CONCURRENCY and EXTRA_JTREG_OPTIONS when running tests
Reviewed-by: tbell, erikj
This commit is contained in:
parent
f243b8ec01
commit
a97b824a58
@ -265,7 +265,10 @@ jaxp_%:
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
ifdef CONCURRENCY
|
||||
EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
|
||||
JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
|
||||
endif
|
||||
ifdef EXTRA_JTREG_OPTIONS
|
||||
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
|
||||
endif
|
||||
|
||||
# Default JTREG to run
|
||||
@ -290,8 +293,6 @@ JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
|
||||
# Set the max memory for jtreg control vm
|
||||
JTREG_MEMORY_OPTION = -J-Xmx512m
|
||||
JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
|
||||
# Add any extra options
|
||||
JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
|
||||
# Set other vm and test options
|
||||
JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
|
||||
# Set the GC options for test vms
|
||||
|
Loading…
x
Reference in New Issue
Block a user