test/Makefile

changeset 2393
5e9879dfadde
parent 2073
4ed8565fa536
child 2525
2eb010b6cb22
child 2806
d35c539d0e6d
equal deleted inserted replaced
2392:73cbce40a149 2393:5e9879dfadde
184 endif 184 endif
185 ifdef JTREG_TIMEOUT_FACTOR 185 ifdef JTREG_TIMEOUT_FACTOR
186 JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR) 186 JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR)
187 endif 187 endif
188 188
189 # Default verbosity setting for jtreg
190 JTREG_VERBOSE = fail,error,nopass
191
192 # Default verbosity setting for jck
193 JCK_VERBOSE = non-pass
194
189 # Assertions: some tests show failures when assertions are enabled. 195 # Assertions: some tests show failures when assertions are enabled.
190 # Since javac is typically loaded via the bootclassloader (either via TESTJAVA 196 # Since javac is typically loaded via the bootclassloader (either via TESTJAVA
191 # or TESTBOOTCLASSPATH), you may need -esa to enable assertions in javac. 197 # or TESTBOOTCLASSPATH), you may need -esa to enable assertions in javac.
192 JTREG_OPTIONS += $(ASSERTION_OPTIONS) 198 JTREG_OPTIONS += $(ASSERTION_OPTIONS)
193 JCK_OPTIONS += $(ASSERTION_OPTIONS:%=-vmoptions:%) 199 JCK_OPTIONS += $(ASSERTION_OPTIONS:%=-vmoptions:%)
254 # Installed location of jtreg 260 # Installed location of jtreg
255 # JT_JAVA 261 # JT_JAVA
256 # Version of java used to run jtreg. Should normally be the same as TESTJAVA 262 # Version of java used to run jtreg. Should normally be the same as TESTJAVA
257 # TESTJAVA 263 # TESTJAVA
258 # Version of java to be tested. 264 # Version of java to be tested.
265 # JTREG_VERBOSE
266 # Verbosity setting for jtreg
259 # JTREG_OPTIONS 267 # JTREG_OPTIONS
260 # Additional options for jtreg 268 # Additional options for jtreg
261 # JTREG_TESTDIRS 269 # JTREG_TESTDIRS
262 # Directories of tests to be run 270 # Directories of tests to be run
263 # JTREG_OUTPUT_DIR 271 # JTREG_OUTPUT_DIR
271 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt 279 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt
272 @mkdir -p $(JTREG_OUTPUT_DIR) 280 @mkdir -p $(JTREG_OUTPUT_DIR)
273 JT_JAVA=$(JT_JAVA) $(JTREG) \ 281 JT_JAVA=$(JT_JAVA) $(JTREG) \
274 -J-Xmx512m \ 282 -J-Xmx512m \
275 -vmoption:-Xmx768m \ 283 -vmoption:-Xmx768m \
276 -a -ignore:quiet -v:fail,error,nopass \ 284 -a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \
277 -r:$(JTREG_OUTPUT_DIR)/JTreport \ 285 -r:$(JTREG_OUTPUT_DIR)/JTreport \
278 -w:$(JTREG_OUTPUT_DIR)/JTwork \ 286 -w:$(JTREG_OUTPUT_DIR)/JTwork \
279 -jdk:$(TESTJAVA) \ 287 -jdk:$(TESTJAVA) \
280 $(JAVA_ARGS:%=-vmoption:%) \ 288 $(JAVA_ARGS:%=-vmoption:%) \
281 $(JTREG_OPTIONS) \ 289 $(JTREG_OPTIONS) \
310 # JT_JAVA 318 # JT_JAVA
311 # Version of java used to run JCK. Should normally be the same as TESTJAVA 319 # Version of java used to run JCK. Should normally be the same as TESTJAVA
312 # Default is JDK 7 320 # Default is JDK 7
313 # TESTJAVA 321 # TESTJAVA
314 # Version of java to be tested. 322 # Version of java to be tested.
323 # JCK_VERBOSE
324 # Verbosity setting for jtjck
315 # JCK_COMPILER_OPTIONS 325 # JCK_COMPILER_OPTIONS
316 # Additional options for JCK-compiler 326 # Additional options for JCK-compiler
317 # JCK_COMPILER_TESTDIRS 327 # JCK_COMPILER_TESTDIRS
318 # Directories of tests to be run 328 # Directories of tests to be run
319 # JCK_COMPILER_OUTPUT_DIR 329 # JCK_COMPILER_OUTPUT_DIR
323 # 333 #
324 jck-compiler-tests: check-jck FRC 334 jck-compiler-tests: check-jck FRC
325 @rm -f -r $(JCK_COMPILER_OUTPUT_DIR)/work $(JCK_COMPILER_OUTPUT_DIR)/report \ 335 @rm -f -r $(JCK_COMPILER_OUTPUT_DIR)/work $(JCK_COMPILER_OUTPUT_DIR)/report \
326 $(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt 336 $(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt
327 @mkdir -p $(JCK_COMPILER_OUTPUT_DIR) 337 @mkdir -p $(JCK_COMPILER_OUTPUT_DIR)
328 $(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \ 338 $(JT_JAVA)/bin/java -Xmx512m \
329 -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \ 339 -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \
330 -v:non-pass \ 340 $(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
331 -r:$(JCK_COMPILER_OUTPUT_DIR)/report \ 341 -r:$(JCK_COMPILER_OUTPUT_DIR)/report \
332 -w:$(JCK_COMPILER_OUTPUT_DIR)/work \ 342 -w:$(JCK_COMPILER_OUTPUT_DIR)/work \
333 -jdk:$(TESTJAVA) \ 343 -jdk:$(TESTJAVA) \
334 $(JCK_COMPILER_OPTIONS) \ 344 $(JCK_COMPILER_OPTIONS) \
335 $(JCK_COMPILER_TESTDIRS) \ 345 $(JCK_COMPILER_TESTDIRS) \
359 # Installed location of JCK: should include JCK-compiler, JCK-runtime and JCK-extras 369 # Installed location of JCK: should include JCK-compiler, JCK-runtime and JCK-extras
360 # JT_JAVA 370 # JT_JAVA
361 # Version of java used to run JCK. Should normally be the same as TESTJAVA 371 # Version of java used to run JCK. Should normally be the same as TESTJAVA
362 # TESTJAVA 372 # TESTJAVA
363 # Version of java to be tested. 373 # Version of java to be tested.
374 # JCK_VERBOSE
375 # Verbosity setting for jtjck
364 # JCK_RUNTIME_OPTIONS 376 # JCK_RUNTIME_OPTIONS
365 # Additional options for JCK-runtime 377 # Additional options for JCK-runtime
366 # JCK_RUNTIME_TESTDIRS 378 # JCK_RUNTIME_TESTDIRS
367 # Directories of tests to be run 379 # Directories of tests to be run
368 # JCK_RUNTIME_OUTPUT_DIR 380 # JCK_RUNTIME_OUTPUT_DIR
372 # 384 #
373 jck-runtime-tests: check-jck FRC 385 jck-runtime-tests: check-jck FRC
374 @rm -f -r $(JCK_RUNTIME_OUTPUT_DIR)/work $(JCK_RUNTIME_OUTPUT_DIR)/report \ 386 @rm -f -r $(JCK_RUNTIME_OUTPUT_DIR)/work $(JCK_RUNTIME_OUTPUT_DIR)/report \
375 $(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt 387 $(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt
376 @mkdir -p $(JCK_RUNTIME_OUTPUT_DIR) 388 @mkdir -p $(JCK_RUNTIME_OUTPUT_DIR)
377 $(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \ 389 $(JT_JAVA)/bin/java -Xmx512m \
378 -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \ 390 -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \
379 -v:non-pass \ 391 $(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
380 -r:$(JCK_RUNTIME_OUTPUT_DIR)/report \ 392 -r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
381 -w:$(JCK_RUNTIME_OUTPUT_DIR)/work \ 393 -w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
382 -jdk:$(TESTJAVA) \ 394 -jdk:$(TESTJAVA) \
383 -Xcompile \ 395 -Xcompile \
384 $(JCK_RUNTIME_OPTIONS) \ 396 $(JCK_RUNTIME_OPTIONS) \

mercurial