move build-gtest-gmock into the Makefile

pull/931/head
Jesse Vincent 4 years ago
parent 1865e33426
commit bbc84f6f33
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -70,3 +70,7 @@ $(info )
endif endif
include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
build-gtest-gmock:
(cd testing/googletest && cmake .)
$(MAKE) -C testing/googletest

@ -592,11 +592,6 @@ EOF
fi fi
} }
build_gtest_gmock() {
kaleidoscope_dir="$(dirname "$0")/.."
(cd "${kaleidoscope_dir}/testing/googletest" && cmake . && make)
}
run_tests() { run_tests() {
(cd "${BOARD_HARDWARE_PATH}/keyboardio" && make prepare-virtual) (cd "${BOARD_HARDWARE_PATH}/keyboardio" && make prepare-virtual)
build_gtest_gmock build_gtest_gmock

Loading…
Cancel
Save