diff --git a/13_integrated_testing/Makefile b/13_integrated_testing/Makefile index 9f575d91..87665c58 100644 --- a/13_integrated_testing/Makefile +++ b/13_integrated_testing/Makefile @@ -1,6 +1,6 @@ ## SPDX-License-Identifier: MIT OR Apache-2.0 ## -## Copyright (c) 2018-2019 Andre Richter +## Copyright (c) 2018-2020 Andre Richter # Default to the RPi3 ifndef BSP @@ -98,7 +98,7 @@ qemu: all $(DOCKER_EXEC_QEMU) $(QEMU_RELEASE_ARGS) \ -kernel $(OUTPUT) -define kernel_test_runner +define KERNEL_TEST_RUNNER #!/usr/bin/env bash $(OBJCOPY_CMD) $$1 $$1.img @@ -107,9 +107,10 @@ define kernel_test_runner ruby tests/runner.rb $(DOCKER_EXEC_QEMU) $(QEMU_TEST_ARGS) -kernel $$TEST_BINARY endef +export KERNEL_TEST_RUNNER test: $(SOURCES) @mkdir -p target - $(file > target/kernel_test_runner.sh,$(kernel_test_runner)) + @echo "$$KERNEL_TEST_RUNNER" > target/kernel_test_runner.sh @chmod +x target/kernel_test_runner.sh RUSTFLAGS="$(RUSTFLAGS_PEDANTIC)" $(XTEST_CMD) $(TEST_ARG) endif diff --git a/13_integrated_testing/README.md b/13_integrated_testing/README.md index 1e5c1531..7133011d 100644 --- a/13_integrated_testing/README.md +++ b/13_integrated_testing/README.md @@ -341,7 +341,7 @@ The file `kernel_test_runner.sh` does not exist by default. We generate it on de `make test` target: ```Makefile -define kernel_test_runner +define KERNEL_TEST_RUNNER #!/usr/bin/env bash $(OBJCOPY_CMD) $$1 $$1.img @@ -350,9 +350,10 @@ define kernel_test_runner ruby tests/runner.rb $(DOCKER_EXEC_QEMU) $(QEMU_TEST_ARGS) -kernel $$TEST_BINARY endef +export KERNEL_TEST_RUNNER test: $(SOURCES) @mkdir -p target - $(file > target/kernel_test_runner.sh,$(kernel_test_runner)) + @echo "$$KERNEL_TEST_RUNNER" > target/kernel_test_runner.sh @chmod +x target/kernel_test_runner.sh RUSTFLAGS="$(RUSTFLAGS_PEDANTIC)" $(XTEST_CMD) $(TEST_ARG) endif