8003357: Add support for jtreg -concurrency to langtools/test/Makefile
Reviewed-by: jjg
This commit is contained in:
parent
b3a3f7cdf3
commit
c39f1d99b4
@ -146,10 +146,15 @@ ifdef TESTBOOTCLASSPATH
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Concurrency is the number of tests that can execute at once.
|
# Concurrency is the number of tests that can execute at once.
|
||||||
# Supported for JCK, not supported for jtreg.
|
|
||||||
# On an otherwise empty machine, suggest setting to (#cpus + 2)
|
# On an otherwise empty machine, suggest setting to (#cpus + 2)
|
||||||
# If unset, the default is (#cpus)
|
# If unset, the default is (#cpus)
|
||||||
### RFE: determine and use #cpus
|
### RFE: determine and use #cpus
|
||||||
|
ifdef CONCURRENCY
|
||||||
|
JTREG_OPTIONS += -agentvm -concurrency:$(CONCURRENCY)
|
||||||
|
else
|
||||||
|
JTREG_OPTIONS += -samevm
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef JCK_CONCURRENCY
|
ifdef JCK_CONCURRENCY
|
||||||
JCK_OPTIONS += -concurrency:$(JCK_CONCURRENCY)
|
JCK_OPTIONS += -concurrency:$(JCK_CONCURRENCY)
|
||||||
endif
|
endif
|
||||||
@ -266,7 +271,7 @@ jtreg-tests: check-jtreg FRC
|
|||||||
@mkdir -p $(JTREG_OUTPUT_DIR)
|
@mkdir -p $(JTREG_OUTPUT_DIR)
|
||||||
JT_JAVA=$(JT_JAVA) $(JTREG) \
|
JT_JAVA=$(JT_JAVA) $(JTREG) \
|
||||||
-J-Xmx512m \
|
-J-Xmx512m \
|
||||||
-a -samevm -ignore:quiet -v:fail,error,nopass \
|
-a -ignore:quiet -v:fail,error,nopass \
|
||||||
-r:$(JTREG_OUTPUT_DIR)/JTreport \
|
-r:$(JTREG_OUTPUT_DIR)/JTreport \
|
||||||
-w:$(JTREG_OUTPUT_DIR)/JTwork \
|
-w:$(JTREG_OUTPUT_DIR)/JTwork \
|
||||||
-jdk:$(TESTJAVA) \
|
-jdk:$(TESTJAVA) \
|
||||||
|
Loading…
Reference in New Issue
Block a user