Skip to content
Permalink
Browse files
8237566: FindTests.gmk should only include existing TEST.ROOT files
Reviewed-by: erikj
  • Loading branch information
edvbld committed Mar 10, 2020
1 parent 441e16e commit 1c1acb47571cf1f509747d08558fa75c471362b0
Showing with 5 additions and 3 deletions.
  1. +5 −3 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.

0 comments on commit 1c1acb4

Please sign in to comment.