# HG changeset patch
# User sla
# Date 1464084946 -7200
# Node ID afc9c8149b1922551323d6cad08ebd1e31f9c79c
# Parent  041a91909d6e2d19588829baa254776c8c756208
8157605: Can't set both CONCURRENCY and EXTRA_JTREG_OPTIONS when running tests
Reviewed-by: tbell, erikj

diff -r 041a91909d6e -r afc9c8149b19 hotspot/test/Makefile
--- a/hotspot/test/Makefile	Mon May 23 13:52:12 2016 -0700
+++ b/hotspot/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:%)