Don't pass TEST_PATH to docker unless it's set

pull/977/head
Jesse Vincent 4 years ago
parent b0902f35da
commit 4ca0e94af9
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -71,6 +71,16 @@ endif
include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
# Set up an argument for passing to the simulator tests in docker
# but if the var isn't set, don't even pass the definition
# since this messes with downstream makefiles
ifneq ($(TEST_PATH),)
TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'"
endif
clean: clean:
$(MAKE) -C tests clean $(MAKE) -C tests clean
rm -rf testing/googletest/build/* rm -rf testing/googletest/build/*
@ -84,7 +94,7 @@ simulator-tests: prepare-virtual
$(MAKE) -C tests all $(MAKE) -C tests all
docker-simulator-tests: docker-simulator-tests:
BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" ./bin/run-docker "make simulator-tests TEST_PATH=\"${TEST_PATH}\"" BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" ./bin/run-docker "make simulator-tests ${TEST_PATH_ARG}"
docker-bash: docker-bash:
BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" ./bin/run-docker "bash" BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" ./bin/run-docker "bash"

Loading…
Cancel
Save