8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt

Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2019-05-29 15:29:06 -07:00
parent 64462e484f
commit cc2d5d3f01
2 changed files with 5 additions and 1 deletions

View File

@ -1199,7 +1199,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br> JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
endif endif
JCOV_REPORT_TITLE += Tests: $(TEST) JCOV_REPORT_TITLE += Tests: $(TEST)
jcov-gen-report: jcov-stop-grabber jcov-gen-report: jcov-stop-grabber
$(call LogWarn, Generating JCov report ...) $(call LogWarn, Generating JCov report ...)
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \ $(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \

View File

@ -337,6 +337,10 @@ SPEC := $(NEW_SPEC)
default: all default: all
run-test-prebuilt: run-test-prebuilt:
# Need to make sure the failure logs output dir exists since
# ExecuteWithLog is called in RunTests.gmk. The PrepareFailureLogs macro
# is unfortunately not available at this point.
$(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs)
@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error @$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
# The lazy initialization of the cache file in FindTests.gmk does not # The lazy initialization of the cache file in FindTests.gmk does not
# always work with RunTests.gmk. To guarantee that the jtreg test groups # always work with RunTests.gmk. To guarantee that the jtreg test groups