From 1c1acb47571cf1f509747d08558fa75c471362b0 Mon Sep 17 00:00:00 2001
From: Erik Helin <ehelin@openjdk.org>
Date: Tue, 10 Mar 2020 16:58:29 +0100
Subject: [PATCH] 8237566: FindTests.gmk should only include existing TEST.ROOT
 files

Reviewed-by: erikj
---
 make/common/FindTests.gmk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk
index 0944dbe6a48..42e7e2f188d 100644
--- a/make/common/FindTests.gmk
+++ b/make/common/FindTests.gmk
@@ -52,9 +52,11 @@ JTREG_TESTROOTS += $(addprefix $(TOPDIR)/test/, hotspot/jtreg jdk langtools nash
 JTREG_ROOT_FILES := $(addsuffix /TEST.ROOT, $(JTREG_TESTROOTS))
 JTREG_GROUP_FILES :=
 $(foreach root, $(JTREG_TESTROOTS), \
-  $(eval include $(root)/TEST.ROOT) \
-  $(eval $(root)_JTREG_GROUP_FILES := $$(addprefix $(root)/, $$(groups))) \
-  $(eval JTREG_GROUP_FILES += $$($(root)_JTREG_GROUP_FILES)) \
+  $(if $(wildcard $(root)/TEST.ROOT), \
+    $(eval include $(root)/TEST.ROOT) \
+    $(eval $(root)_JTREG_GROUP_FILES := $$(addprefix $(root)/, $$(groups))) \
+    $(eval JTREG_GROUP_FILES += $$($(root)_JTREG_GROUP_FILES)) \
+   ) \
 )
 
 # Cache the expensive to calculate test names in a generated makefile.