changeset 55098:609dc5c60c06

8224011: Failure handling in ExecuteWithLog fails in run-test-prebuilt Reviewed-by: tbell
author erikj
date Wed, 29 May 2019 15:29:06 -0700
parents ae908641e726
children a29fa5133004
files make/RunTests.gmk make/RunTestsPrebuilt.gmk
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/RunTests.gmk	Wed May 29 22:30:14 2019 +0100
+++ b/make/RunTests.gmk	Wed May 29 15:29:06 2019 -0700
@@ -1199,7 +1199,7 @@
     JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
   endif
   JCOV_REPORT_TITLE += Tests: $(TEST)
-	
+
   jcov-gen-report: jcov-stop-grabber
 	$(call LogWarn, Generating JCov report ...)
 	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
--- a/make/RunTestsPrebuilt.gmk	Wed May 29 22:30:14 2019 +0100
+++ b/make/RunTestsPrebuilt.gmk	Wed May 29 15:29:06 2019 -0700
@@ -337,6 +337,10 @@
 default: all
 
 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
         # The lazy initialization of the cache file in FindTests.gmk does not
         # always work with RunTests.gmk. To guarantee that the jtreg test groups