From 600d82adf81d64f66b0da7b11de7aa3aa9ed60e2 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 20 May 2020 14:09:18 +0200
Subject: [PATCH] 8245281: Disabling hotspot gtest builds make it impossible to
 run tests

Reviewed-by: erikj
---
 make/Main.gmk | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index 20a1fff3247..bbe41cbc5c0 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1100,16 +1100,23 @@ endif
 # This target builds the documentation image
 docs-image: docs-jdk
 
-# If not already set, set the JVM specific targets to build the test image
-JVM_TEST_IMAGE_TARGETS ?= test-image-hotspot-jtreg-native test-image-hotspot-gtest
-
-ifeq ($(INCLUDE_GRAAL), true)
-  JVM_TEST_IMAGE_TARGETS += test-image-hotspot-jtreg-graal
-endif
-
 # This target builds the test image
-test-image: prepare-test-image test-image-jdk-jtreg-native \
-    test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS)
+test-image: prepare-test-image test-image-jdk-jtreg-native test-image-demos-jdk
+
+ifneq ($(JVM_TEST_IMAGE_TARGETS), )
+  # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
+  # standard hotspot set of tests.
+  test-image: $(JVM_TEST_IMAGE_TARGETS)
+else
+  test-image: test-image-hotspot-jtreg-native
+  ifeq ($(BUILD_GTEST), true)
+    test-image: test-image-hotspot-gtest
+  endif
+
+  ifeq ($(INCLUDE_GRAAL), true)
+    test-image: test-image-hotspot-jtreg-graal
+  endif
+endif
 
 ifeq ($(BUILD_FAILURE_HANDLER), true)
   test-image: test-image-failure-handler