Skip to content

Commit

Permalink
Don't pass TEST_PATH to docker unless it's set
Browse files Browse the repository at this point in the history
  • Loading branch information
obra committed Nov 14, 2020
1 parent b0902f3 commit 4ca0e94
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@ endif

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:
$(MAKE) -C tests clean
rm -rf testing/googletest/build/*
Expand All @@ -84,7 +94,7 @@ simulator-tests: prepare-virtual
$(MAKE) -C tests all

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:
BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" ./bin/run-docker "bash"
Expand Down

0 comments on commit 4ca0e94

Please sign in to comment.