From 80232b7e753129ca7a4f1ca9b70844e0c7d8eabf Mon Sep 17 00:00:00 2001
From: Antonios Printezis <tonyp@openjdk.org>
Date: Mon, 5 Jun 2023 15:35:42 +0000
Subject: [PATCH] 8308969: make test-prebuilt doesn't return the correct exit
 code

Reviewed-by: erikj
---
 make/Global.gmk           | 5 +++++
 make/RunTestsPrebuilt.gmk | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/make/Global.gmk b/make/Global.gmk
index 618e9ca243993..b41c4051cfafd 100644
--- a/make/Global.gmk
+++ b/make/Global.gmk
@@ -125,6 +125,11 @@ test-prebuilt:
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
 	    test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 
+test-prebuilt-with-exit-code:
+	@( cd $(topdir) && \
+	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
+	    test-prebuilt-with-exit-code CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
+
 # Alias for backwards compatibility
 run-test-prebuilt: test-prebuilt
 
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 85c6bae63993a..ca20ccf26ad20 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -295,6 +295,11 @@ test-prebuilt:
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
 
+test-prebuilt-with-exit-code: test-prebuilt
+	@if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
+	  exit 1 ; \
+	fi
+
 all: test-prebuilt
 
 .PHONY: default all test-prebuilt