diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-01 09:31:56 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-08 07:17:09 +0200 |
| commit | e781190cda3d8b4e17ac0a6985570a485e164d89 (patch) | |
| tree | fbcd7a236e349369c22f8dbcbeab94b71d6ee10b | |
| parent | e11bd71f89649da3cff439c030d2ccac0cc914e3 (diff) | |
| download | focaccia-qemu-e781190cda3d8b4e17ac0a6985570a485e164d89.tar.gz focaccia-qemu-e781190cda3d8b4e17ac0a6985570a485e164d89.zip | |
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>
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | tests/Makefile.include | 15 | ||||
| -rw-r--r-- | tests/qemu-iotests/meson.build | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 04e070bb3b..f010e2da17 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') diff --git a/tests/Makefile.include b/tests/Makefile.include index 497f1f21ff..5c05e84a9a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -470,7 +470,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) - # Python venv for running tests .PHONY: check-venv check-acceptance @@ -525,8 +524,18 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images # Consolidated targets .PHONY: check-block check-unit check check-clean get-vm-images -check-block: -check-build: build-unit +check: + +ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) +QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) +check: check-block +check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ + qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ + $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) + @$< +endif + +check-build: build-unit $(QEMU_IOTESTS_HELPERS-y) check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 3de09fb8fa..60470936b4 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -4,7 +4,3 @@ if 'CONFIG_LINUX' in config_host else socket_scm_helper = [] endif -test('qemu-iotests', sh, args: [files('../check-block.sh')], - depends: [qemu_block_tools, emulators, socket_scm_helper], - suite: 'block', timeout: 10000) - |