localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

Detect failures when running multiple tests 

Also add better output.
This commit is contained in:
Fred Sundvik 2016-08-27 14:53:57 +03:00
parent ffb0a126f5
commit 7eefb34e7c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -415,7 +415,15 @@ define BUILD_TEST
MAKE_MSG := $$(MSG_MAKE_TEST) MAKE_MSG := $$(MSG_MAKE_TEST)
$$(eval $$(call BUILD)) $$(eval $$(call BUILD))
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
TESTS += $$(TEST_EXECUTABLE) TESTS += $$(TEST_NAME)
TEST_MSG := $$(MSG_TEST)
$$(TEST_NAME)_COMMAND := \
printf "$$(TEST_MSG)\n"; \
$$(TEST_EXECUTABLE); \
if [ $$$$? -gt 0 ]; \
then error_occured=1; \
fi; \
printf "\n";
endef endef
define PARSE_TEST define PARSE_TEST
@ -472,7 +480,8 @@ $(SUBPROJECTS): %: %-allkm
+error_occured=0; \ +error_occured=0; \
$(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \
if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\ if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\
$(foreach TEST,$(TESTS),$(TEST);) $(foreach TEST,$(TESTS),$($(TEST)_COMMAND)) \
if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\
# All should compile everything # All should compile everything
.PHONY: all .PHONY: all

1
message.mk
View File

@ -76,3 +76,4 @@ define GENERATE_MSG_MAKE_TEST
endif endif
endef endef
MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL) MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL)
MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR)