OpenJDK / loom / loom
changeset 38475:ec5fd6636aae
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:14:28 +0200 |
| parents | db344a94eb44 |
| children | c491c24d34a9 |
| files | jdk/test/Makefile |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/Makefile Tue May 24 09:18:40 2016 +0100 +++ b/jdk/test/Makefile Tue May 24 12:14:28 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