masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Running of unit tests 

But only if the compilation has succeeded
This commit is contained in:
Fred Sundvik 2016-08-25 11:25:27 +03:00
parent 0a11460175
commit f4429ba48c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -28,6 +28,7 @@ ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE))
ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE)) ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE))
ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE)) ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE))
STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR)) STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR))
TEST_DIR := $(ROOT_DIR)/.build/test
MAKEFILE_INCLUDED=yes MAKEFILE_INCLUDED=yes
@ -394,7 +395,10 @@ define BUILD
fi; fi;
COMMAND_false_$$(COMMAND) := \ COMMAND_false_$$(COMMAND) := \
printf "$$(MAKE_MSG)\n\n"; \ printf "$$(MAKE_MSG)\n\n"; \
$$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; \
if [ $$$$? -gt 0 ]; \
then error_occured=1; \
fi;
endef endef
# Just parse all the keymaps for a specifc keyboard # Just parse all the keymaps for a specifc keyboard
@ -410,6 +414,7 @@ define BUILD_TEST
MAKE_VARS := TEST=$$(TEST_NAME) MAKE_VARS := TEST=$$(TEST_NAME)
MAKE_MSG := $$(MSG_MAKE_TEST) MAKE_MSG := $$(MSG_MAKE_TEST)
$$(eval $$(call BUILD)) $$(eval $$(call BUILD))
TESTS += $$(TEST_DIR)/$$(TEST_NAME).elf
endef endef
define PARSE_TEST define PARSE_TEST
@ -464,8 +469,8 @@ $(SUBPROJECTS): %: %-allkm
# But we return the error code at the end, to trigger travis failures # But we return the error code at the end, to trigger travis failures
+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))
# All should compile everything # All should compile everything
.PHONY: all .PHONY: all