Mercurial > hg > openjdk > jdk9 > jaxp
changeset 930:ecbe72546137 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:23 +0200 |
parents | f2f4b16d2cac |
children | a265b8116058 6deb9f071fb3 |
files | test/Makefile |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile Sat May 21 08:00:14 2016 +0100 +++ b/test/Makefile Tue May 24 12:15:23 2016 +0200 @@ -265,7 +265,10 @@ # ------------------------------------------------------------------ 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 @@ -290,8 +293,6 @@ # Set the max memory for jtreg control vm JTREG_MEMORY_OPTION = -J-Xmx512m JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) -# 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