8157605: Can't set both CONCURRENCY and EXTRA_JTREG_OPTIONS when running tests
Reviewed-by: tbell, erikj
This commit is contained in:
parent
8eb7fed92f
commit
76311d7285
@ -306,7 +306,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
|
||||||
@ -326,8 +329,6 @@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
|
|||||||
# Multiply by 4 the timeout factor
|
# Multiply by 4 the timeout factor
|
||||||
JTREG_TIMEOUT_OPTION = -timeoutFactor:4
|
JTREG_TIMEOUT_OPTION = -timeoutFactor:4
|
||||||
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
|
JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
|
||||||
# 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_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
|
JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user