Mercurial > hg > openjdk > jdk9 > hotspot
changeset 11263:0be6f4f5d186 jdk-9+120
8157605: Can't set both CONCURRENCY and EXTRA_JTREG_OPTIONS when running tests
Reviewed-by: tbell, erikj
| author | sla |
|---|---|
| date | Tue, 24 May 2016 12:15:46 +0200 |
| parents | cca990cdcb14 |
| children | 7e293105dbb0 |
| files | test/Makefile |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile Mon May 23 13:52:12 2016 -0700 +++ b/test/Makefile Tue May 24 12:15:46 2016 +0200 @@ -306,7 +306,10 @@ endif 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 @@ -326,8 +329,6 @@ # Multiply by 4 the timeout factor JTREG_TIMEOUT_OPTION = -timeoutFactor:4 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) -# Add any extra options -JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) # Set other vm and test options JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)