diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-11-23 09:54:04 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-11-23 09:54:04 +1100 |
| commit | 7746aefe94cc4cd492bfafdef73d95d073f0603b (patch) | |
| tree | 42c6daae724c74f7e21422f3fec4dc384c0e1f5d /build_test.mk | |
| parent | b6054c0206609f3755f71d819643644d250288b0 (diff) | |
| download | qmk_firmware-7746aefe94cc4cd492bfafdef73d95d073f0603b.tar.gz qmk_firmware-7746aefe94cc4cd492bfafdef73d95d073f0603b.zip | |
Revert "[Tests] Increase QMK test coverage (#13789)"
This reverts commit b6054c0206609f3755f71d819643644d250288b0.
Diffstat (limited to 'build_test.mk')
| -rw-r--r-- | build_test.mk | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/build_test.mk b/build_test.mk index 136a0455f0..36cb7936ed 100644 --- a/build_test.mk +++ b/build_test.mk @@ -16,14 +16,14 @@ TEST_OBJ = $(BUILD_DIR)/test_obj OUTPUTS := $(TEST_OBJ)/$(TEST) $(GTEST_OUTPUT) GTEST_INC := \ - $(LIB_PATH)/googletest/googletest/include \ - $(LIB_PATH)/googletest/googlemock/include + $(LIB_PATH)/googletest/googletest/include\ + $(LIB_PATH)/googletest/googlemock/include\ -GTEST_INTERNAL_INC := \ - $(LIB_PATH)/googletest/googletest \ +GTEST_INTERNAL_INC :=\ + $(LIB_PATH)/googletest/googletest\ $(LIB_PATH)/googletest/googlemock -$(GTEST_OUTPUT)_SRC := \ +$(GTEST_OUTPUT)_SRC :=\ googletest/src/gtest-all.cc\ googlemock/src/gmock-all.cc @@ -33,9 +33,9 @@ $(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC) LDFLAGS += -lstdc++ -lpthread -shared-libgcc CREATE_MAP := no -VPATH += \ - $(LIB_PATH)/googletest \ - $(LIB_PATH)/googlemock \ +VPATH +=\ + $(LIB_PATH)/googletest\ + $(LIB_PATH)/googlemock\ $(LIB_PATH)/printf all: elf @@ -49,8 +49,7 @@ CONSOLE_ENABLE = yes endif ifneq ($(filter $(FULL_TESTS),$(TEST)),) -include tests/test_common/build.mk -include $(TEST_PATH)/test.mk +include tests/$(TEST)/rules.mk endif include common_features.mk |