From 2baa671d4580d154f6ed9a48b15f684f9208794c Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Tue, 24 May 2016 12:15:02 +0200
Subject: [PATCH] 8157605: Can't set both CONCURRENCY and EXTRA_JTREG_OPTIONS
 when running tests

Reviewed-by: tbell, erikj
---
 nashorn/test/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nashorn/test/Makefile b/nashorn/test/Makefile
index d4f5afe6da1..ee2b87439e8 100644
--- a/nashorn/test/Makefile
+++ b/nashorn/test/Makefile
@@ -301,7 +301,10 @@ ifdef TESTDIRS
 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
@@ -328,8 +331,6 @@ JTREG_MEMORY_OPTION = -J-Xmx512m
 JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
 # Give tests access to JT_JAVA, see JDK-8141609
 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
-# 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