aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-09-01 09:31:56 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-09-08 07:17:09 +0200
commite781190cda3d8b4e17ac0a6985570a485e164d89 (patch)
treefbcd7a236e349369c22f8dbcbeab94b71d6ee10b /meson.build
parente11bd71f89649da3cff439c030d2ccac0cc914e3 (diff)
downloadqemu-e781190cda3d8b4e17ac0a6985570a485e164d89.zip
qemu-e781190cda3d8b4e17ac0a6985570a485e164d89.tar.gz
qemu-e781190cda3d8b4e17ac0a6985570a485e164d89.tar.bz2
qemu-iotests: move check-block back to Makefiles
check-block has its own test harness, unlike every other test. If we capture its output, as is in general nicer to do without V=1, there will be no sign of progress. So for lack of a better option just move the invocation of the test back to Makefile rules. As a side effect, this will also fix "make check" in --disable-tools builds, as they were trying to run qemu-iotests without having made qemu-img before. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build1
1 files changed, 0 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 04e070b..f010e2d 100644
--- a/meson.build
+++ b/meson.build
@@ -1102,7 +1102,6 @@ if have_tools
dependencies: [block, qemuutil], install: true)
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [block, qemuutil], install: true)
- qemu_block_tools += [qemu_img, qemu_io, qemu_nbd]
subdir('storage-daemon')
subdir('contrib/rdmacm-mux')