From bbc84f6f33f2e86de54844a754d404c89e8ff870 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Wed, 14 Oct 2020 21:27:32 -0700 Subject: [PATCH] move build-gtest-gmock into the Makefile --- Makefile | 4 ++++ bin/kaleidoscope-builder | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7682689b..ef2d92f4 100644 --- a/Makefile +++ b/Makefile @@ -70,3 +70,7 @@ $(info ) endif include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk + +build-gtest-gmock: + (cd testing/googletest && cmake .) + $(MAKE) -C testing/googletest diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 46b3bd71..665c7ced 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -592,11 +592,6 @@ EOF fi } -build_gtest_gmock() { - kaleidoscope_dir="$(dirname "$0")/.." - (cd "${kaleidoscope_dir}/testing/googletest" && cmake . && make) -} - run_tests() { (cd "${BOARD_HARDWARE_PATH}/keyboardio" && make prepare-virtual) build_gtest_gmock