From 344bddf882d56e07d52ef336abcbfcc6b9f1edb3 Mon Sep 17 00:00:00 2001 From: mikeller Date: Sun, 3 Feb 2019 17:38:55 +1300 Subject: [PATCH] Make 'test-representative' work as expected. --- src/test/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/Makefile b/src/test/Makefile index 6f86426754..9e4456ca7f 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -430,7 +430,7 @@ TESTS_TARGET_SPECIFIC_EXPANDED = $(foreach test,$(TESTS_TARGET_SPECIFIC),$(forea TESTS = $(foreach test,$(TEST_BASENAMES),$(if $($(test)_EXPAND),,$(test))) TESTS_ALL = $(TESTS) $(TESTS_TARGET_SPECIFIC_EXPANDED) -TESTS_REPRESENTATIVE = $(TESTS) $(foreach test,$(TEST_TARGET_SPECIFIC), \ +TESTS_REPRESENTATIVE = $(TESTS) $(foreach test,$(TESTS_TARGET_SPECIFIC), \ $(test).$(word 1,$(filter-out $($(test)_BLACKLIST),$(VALID_TARGETS)))) # All Google Test headers. Usually you shouldn't change this @@ -615,7 +615,11 @@ endef ifeq ($(MAKECMDGOALS),test-all) $(eval $(foreach test,$(TESTS_ALL),$(call test-specific-stuff,$(test)))) else - $(eval $(foreach test,$(TESTS),$(call test-specific-stuff,$(test)))) + ifeq ($(MAKECMDGOALS),test-representative) + $(eval $(foreach test,$(TESTS_REPRESENTATIVE),$(call test-specific-stuff,$(test)))) + else + $(eval $(foreach test,$(TESTS),$(call test-specific-stuff,$(test)))) + endif endif $(foreach test,$(TESTS_ALL),$(if $($(basename $(test))_SRC),,$(error \