equal
deleted
inserted
replaced
409 |
409 |
410 ifneq ($$(JIB_JAR), ) |
410 ifneq ($$(JIB_JAR), ) |
411 $1_JTREG_BASIC_OPTIONS += -cpa:$$(JIB_JAR) |
411 $1_JTREG_BASIC_OPTIONS += -cpa:$$(JIB_JAR) |
412 endif |
412 endif |
413 |
413 |
414 run-test-$1: |
414 clean-workdir-$1: |
|
415 $$(RM) -r $$($1_TEST_SUPPORT_DIR) |
|
416 |
|
417 run-test-$1: clean-workdir-$1 |
415 $$(call LogWarn) |
418 $$(call LogWarn) |
416 $$(call LogWarn, Running test '$$($1_TEST)') |
419 $$(call LogWarn, Running test '$$($1_TEST)') |
417 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
420 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
418 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \ |
421 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \ |
419 $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ |
422 $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ |