aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-27 13:29:54 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-08-27 21:57:49 +0300
commitfc855cb30e86aadee7b1d9ee62f83d85cc0447ea (patch)
treec09180b775d723e9d8d63f39b7a5c6c1fa20ede8 /Makefile
parentf4429ba48ca8346a208b711cd63e7413ac3efeff (diff)
downloadqmk_firmware-fc855cb30e86aadee7b1d9ee62f83d85cc0447ea.tar.gz
qmk_firmware-fc855cb30e86aadee7b1d9ee62f83d85cc0447ea.zip
Fix running multiple tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 054aa31ec..5f5c46860 100644
--- a/Makefile
+++ b/Makefile
@@ -414,10 +414,12 @@ define BUILD_TEST
414 MAKE_VARS := TEST=$$(TEST_NAME) 414 MAKE_VARS := TEST=$$(TEST_NAME)
415 MAKE_MSG := $$(MSG_MAKE_TEST) 415 MAKE_MSG := $$(MSG_MAKE_TEST)
416 $$(eval $$(call BUILD)) 416 $$(eval $$(call BUILD))
417 TESTS += $$(TEST_DIR)/$$(TEST_NAME).elf 417 TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
418 TESTS += $$(TEST_EXECUTABLE)
418endef 419endef
419 420
420define PARSE_TEST 421define PARSE_TEST
422 TESTS :=
421 TEST_NAME := $$(firstword $$(subst -, ,$$(RULE))) 423 TEST_NAME := $$(firstword $$(subst -, ,$$(RULE)))
422 TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME)-,,$$(RULE))) 424 TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME)-,,$$(RULE)))
423 MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),)) 425 MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),))
@@ -470,7 +472,7 @@ $(SUBPROJECTS): %: %-allkm
470 +error_occured=0; \ 472 +error_occured=0; \
471 $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ 473 $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \
472 if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\ 474 if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\
473 $(foreach TEST,$(TESTS),$(TEST)) 475 $(foreach TEST,$(TESTS),$(TEST);)
474 476
475# All should compile everything 477# All should compile everything
476.PHONY: all 478.PHONY: all