changeset 1700:80a95fbd3e68

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:02 +0200
parents 141d0cf2c12e
children 7ab7fc00b147
files test/Makefile
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Fri May 20 16:02:36 2016 +0200
+++ b/test/Makefile	Tue May 24 12:15:02 2016 +0200
@@ -301,7 +301,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
@@ -328,8 +331,6 @@
 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