From eb060e7fcd44dc373a6dac8e0af8f2e4faadc41c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 5 Jun 2020 10:23:07 -0500 Subject: [PATCH] RULES_MODULES: Fix runtests with no submodules --- configure/RULES_MODULES | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configure/RULES_MODULES b/configure/RULES_MODULES index a163ce18d..57a459173 100644 --- a/configure/RULES_MODULES +++ b/configure/RULES_MODULES @@ -50,9 +50,11 @@ realclean: # Append all our live submodule failure files FAILURE_FILES = $(addsuffix /$(TEST_FAILURE_FILENAME), $(LIVE_SUBMODULES)) +define combine_failure_files + @$(TOUCH) $(FAILURE_FILES) + @$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE) +endef runtests: | $(addsuffix $(DIVIDER)runtests, $(LIVE_SUBMODULES)) - @$(TOUCH) $(FAILURE_FILES) - @$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE) + $(if $(FAILURE_FILES), $(combine_failure_files)) test-results: | $(addsuffix $(DIVIDER)test-results, $(LIVE_SUBMODULES)) - @$(TOUCH) $(FAILURE_FILES) - @$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE) + $(if $(FAILURE_FILES), $(combine_failure_files))