aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.include
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-10-06 11:27:47 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2022-01-28 11:13:33 +0100
commit98487b9035d8540376024df74ab5510fdc37f12e (patch)
tree4bdc68cc5004ccaecace5a34a3d41183a6a8b0d9 /tests/Makefile.include
parent3e233e29178dd9ebd3b3c3382a2e0ebea9e8127d (diff)
downloadqemu-98487b9035d8540376024df74ab5510fdc37f12e.zip
qemu-98487b9035d8540376024df74ab5510fdc37f12e.tar.gz
qemu-98487b9035d8540376024df74ab5510fdc37f12e.tar.bz2
build: make check-block a meson test
"meson test" can be asked to run tests verbosely; this makes it usable also for qemu-iotests's own harness, and it lets "make check-block" reuse mtest2make.py's infrastructure to find and build test dependencies. Adjust check-block.sh to use the standard exit code that reports a test as skipped. Alternatively, in the future we could make it produce TAP output, which is consistent with all other "make check" tests. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/Makefile.include')
-rw-r--r--tests/Makefile.include16
1 files changed, 3 insertions, 13 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3aba622..9157a57 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -156,19 +156,9 @@ check:
ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy)
check: check-block
-export PYTHON
-
-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
- @$<
+check-block: run-ninja
+ $(if $(MAKE.n),,+)$(MESON) test $(MTESTARGS) $(.mtestargs) --verbose \
+ --logbase iotestslog $(call .speed.$(SPEED), block block-slow block-thorough)
endif
check-build: run-ninja