From 3c3c5e69c6857d613cb3f98b91a85441a2101a70 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 5 Sep 2017 18:07:00 +0800 Subject: [PATCH] build system: fix building tests specified via TEST_COMPONENTS --- make/project.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/make/project.mk b/make/project.mk index 9846872a28..ec4352cd7e 100644 --- a/make/project.mk +++ b/make/project.mk @@ -147,17 +147,17 @@ export COMPONENTS # can use $(notdir x) to get the component name. COMPONENT_PATHS := $(foreach comp,$(COMPONENTS),$(firstword $(foreach cd,$(COMPONENT_DIRS),$(wildcard $(dir $(cd))$(comp) $(cd)/$(comp))))) -# If TESTS_ALL set to 1, set TEST_COMPONENTS_LIST to all components -ifdef TESTS_ALL +TEST_COMPONENTS ?= +TESTS_ALL ?= + +# If TESTS_ALL set to 1, set TEST_COMPONENTS_LIST to all components. +# Otherwise, use the list supplied in TEST_COMPONENTS. ifeq ($(TESTS_ALL),1) TEST_COMPONENTS_LIST := $(COMPONENTS) -else # TESTS_ALL not empty and not 1 -# otherwise, use TEST_COMPONENTS +else TEST_COMPONENTS_LIST := $(TEST_COMPONENTS) endif -else # TESTS_ALL unset -TEST_COMPONENTS_LIST := -endif + TEST_COMPONENT_PATHS := $(foreach comp,$(TEST_COMPONENTS_LIST),$(firstword $(foreach dir,$(COMPONENT_DIRS),$(wildcard $(dir)/$(comp)/test)))) TEST_COMPONENT_NAMES := $(foreach comp,$(TEST_COMPONENT_PATHS),$(lastword $(subst /, ,$(dir $(comp))))_test)