equal
deleted
inserted
replaced
144 -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \ |
144 -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \ |
145 -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) |
145 -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) |
146 endif |
146 endif |
147 |
147 |
148 # Concurrency is the number of tests that can execute at once. |
148 # Concurrency is the number of tests that can execute at once. |
149 # Supported for JCK, not supported for jtreg. |
|
150 # On an otherwise empty machine, suggest setting to (#cpus + 2) |
149 # On an otherwise empty machine, suggest setting to (#cpus + 2) |
151 # If unset, the default is (#cpus) |
150 # If unset, the default is (#cpus) |
152 ### RFE: determine and use #cpus |
151 ### RFE: determine and use #cpus |
|
152 ifdef CONCURRENCY |
|
153 JTREG_OPTIONS += -agentvm -concurrency:$(CONCURRENCY) |
|
154 else |
|
155 JTREG_OPTIONS += -samevm |
|
156 endif |
|
157 |
153 ifdef JCK_CONCURRENCY |
158 ifdef JCK_CONCURRENCY |
154 JCK_OPTIONS += -concurrency:$(JCK_CONCURRENCY) |
159 JCK_OPTIONS += -concurrency:$(JCK_CONCURRENCY) |
155 endif |
160 endif |
156 |
161 |
157 # JCK is executed using "Multi-JVM Group Mode", which is a hybrid |
162 # JCK is executed using "Multi-JVM Group Mode", which is a hybrid |
264 @rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \ |
269 @rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \ |
265 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt |
270 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt |
266 @mkdir -p $(JTREG_OUTPUT_DIR) |
271 @mkdir -p $(JTREG_OUTPUT_DIR) |
267 JT_JAVA=$(JT_JAVA) $(JTREG) \ |
272 JT_JAVA=$(JT_JAVA) $(JTREG) \ |
268 -J-Xmx512m \ |
273 -J-Xmx512m \ |
269 -a -samevm -ignore:quiet -v:fail,error,nopass \ |
274 -a -ignore:quiet -v:fail,error,nopass \ |
270 -r:$(JTREG_OUTPUT_DIR)/JTreport \ |
275 -r:$(JTREG_OUTPUT_DIR)/JTreport \ |
271 -w:$(JTREG_OUTPUT_DIR)/JTwork \ |
276 -w:$(JTREG_OUTPUT_DIR)/JTwork \ |
272 -jdk:$(TESTJAVA) \ |
277 -jdk:$(TESTJAVA) \ |
273 $(JAVA_ARGS:%=-vmoption:%) \ |
278 $(JAVA_ARGS:%=-vmoption:%) \ |
274 $(JTREG_OPTIONS) \ |
279 $(JTREG_OPTIONS) \ |