changeset 61190:8639621c8a18

8244930: Building without test failure handler broken after JDK-8244844 Reviewed-by: erikj
author ihse
date Wed, 13 May 2020 15:03:24 +0200
parents 0c9f3396f515
children f143729ca00e
files make/Main.gmk
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Tue May 12 19:20:28 2020 -0400
+++ b/make/Main.gmk	Wed May 13 15:03:24 2020 +0200
@@ -1109,10 +1109,13 @@
 endif
 
 # This target builds the test image
-test-image: prepare-test-image \
-    test-image-jdk-jtreg-native test-image-failure-handler \
+test-image: prepare-test-image test-image-jdk-jtreg-native \
     test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS)
 
+ifeq ($(BUILD_FAILURE_HANDLER), true)
+  test-image: test-image-failure-handler
+endif
+
 ifneq ($(JMH_CORE_JAR), )
   test-image: build-microbenchmark
 endif