move run-tests out to the Makefile

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

@ -71,6 +71,14 @@ endif
include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
prepare-virtual:
$(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual
run-tests: prepare-virtual build-gtest-gmock
$(MAKE) -c tests
@: # blah
build-gtest-gmock: build-gtest-gmock:
(cd testing/googletest && cmake .) (cd testing/googletest && cmake .)
$(MAKE) -C testing/googletest $(MAKE) -C testing/googletest

@ -592,19 +592,6 @@ EOF
fi fi
} }
run_tests() {
(cd "${BOARD_HARDWARE_PATH}/keyboardio" && make prepare-virtual)
build_gtest_gmock
kaleidoscope_dir="$(dirname "$0")/.."
cd "${kaleidoscope_dir}/tests"
${MAKE:-make}
}
docker_tests() {
kaleidoscope_dir="$(dirname "$0")/.."
cd "${kaleidoscope_dir}"
bin/run-docker make -C tests all
}
usage () { usage () {
cat <<- EOF cat <<- EOF
@ -644,8 +631,6 @@ usage () {
build-all build-all
Build all Sketches we can find. Build all Sketches we can find.
run-tests | docker-tests
Builds and runs the test suite, on the host, and in docker, respectively.
EOF EOF
} }

Loading…
Cancel
Save