diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-06 04:18:27 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-13 10:47:22 +0200 |
| commit | 097a5f19a357b6bc699a05ccd119bfa89ea409cc (patch) | |
| tree | 750ffba2c632637d09e03f7edb9424c797a5dbda | |
| parent | 8009806ec81ff2caa711c99e87ca394f9ba50565 (diff) | |
| download | focaccia-qemu-097a5f19a357b6bc699a05ccd119bfa89ea409cc.tar.gz focaccia-qemu-097a5f19a357b6bc699a05ccd119bfa89ea409cc.zip | |
build: fix "make check" without earlier "make"
"make check", if not preceded by "make", will not build the tools needed by qemu-iotests. This happens because qemu-iotests, aka "make check-block", is not yet part of meson.build. While at it, remove the reference to the now-dead QEMU_IOTESTS_HELPERS-y variable. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | tests/Makefile.include | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index cc1e4f2c07..8434a33fe6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -150,14 +150,21 @@ check: ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) check: check-block export PYTHON -check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ - storage-daemon/qemu-storage-daemon$(EXESUF) \ - qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ - $(filter qemu-system-%, $(ninja-targets)) + +ifneq ($(filter check check-block check-build, $(MAKECMDGOALS)),) +ninja-cmd-goals += \ + qemu-img$(EXESUF) \ + qemu-io$(EXESUF) \ + qemu-nbd$(EXESUF) \ + storage-daemon/qemu-storage-daemon$(EXESUF) \ + $(filter qemu-system-%, $(ninja-targets)) +endif + +check-block: $(SRC_PATH)/tests/check-block.sh run-ninja @$< endif -check-build: $(QEMU_IOTESTS_HELPERS-y) +check-build: run-ninja check-clean: rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) |