stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8226538: find-files.gmk gets corrupted if tab completion is used before running make first

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2019-06-21 06:33:55 -07:00
parent fc6b87472c
commit d1017b71ad
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/common/FindTests.gmk
View File

@ -62,10 +62,8 @@ FIND_TESTS_CACHE_FILE := $(MAKESUPPORT_OUTPUTDIR)/find-tests.gmk
# If this file is deemed outdated, it will automatically get regenerated
# by this rule before being included below.
#
# When calling TestMake.gmk, override the log level to avoid any kind of debug
# output being captured into the generated makefile.
$(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES)
$(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES) \
$(TOPDIR)/test/make/TestMake.gmk
$(call MakeTargetDir)
( $(foreach root, $(JTREG_TESTROOTS), \
$(PRINTF) "\n$(root)_JTREG_TEST_GROUPS := " ; \
@ -73,10 +71,11 @@ $(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES)
$($(root)_JTREG_GROUP_FILES) \
| $(SORT) -u | $(TR) '\n' ' ' ; \
) \
$(PRINTF) "\nMAKE_TEST_TARGETS := " ; \
$(MAKE) -s --no-print-directory $(MAKE_ARGS) LOG_LEVEL=warn \
SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
) > $@
$(PRINTF) "\nMAKE_TEST_TARGETS := " >> $@
$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
TARGETS_FILE=$@
-include $(FIND_TESTS_CACHE_FILE)

3
test/make/TestMake.gmk
View File

@ -46,7 +46,8 @@ TARGETS += make-base java-compilation copy-files idea compile-commands
all: $(TARGETS)
# Prints targets to TARGETS_FILE which must be set when calling this target.
print-targets:
$(ECHO) "$(TARGETS)"
$(ECHO) "$(TARGETS)" >> $(TARGETS_FILE)
.PHONY: default all $(TARGETS)