haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: fix "make check" without earlier "make"

Browse source 
"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>
This commit is contained in:
Paolo Bonzini 2021-10-06 04:18:27 -04:00
parent 8009806ec8
commit 097a5f19a3
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/Makefile.include
View file

@ -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)