dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
qemu_io = executable('qemu-io', files('qemu-io.c'),
dependencies: [block, qemuutil], install: true)
+ qemu_block_tools = [qemu_img, qemu_io]
if targetos == 'linux' or targetos == 'sunos' or targetos.endswith('bsd')
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [block, qemuutil], install: true)
+ qemu_block_tools += [qemu_nbd]
endif
subdir('storage-daemon')
check-unit-y += tests/ptimer-test$(EXESUF)
check-unit-y += tests/test-qapi-util$(EXESUF)
-check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.sh
-
generated-files-y += tests/test-qapi-types.h
generated-files-y += tests/include/test-qapi-types-sub-module.h
generated-files-y += tests/test-qapi-types-sub-sub-module.h
clean-tcg: $(CLEAN_TCG_TARGET_RULES)
-QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
-
-.PHONY: check-tests/check-block.sh
-check-tests/check-block.sh: 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)))
- @$<
-
# Python venv for running tests
.PHONY: check-venv check-acceptance
# Consolidated targets
.PHONY: check-block check-unit check check-clean get-vm-images
-ifeq ($(CONFIG_TOOLS),y)
-check-block: $(patsubst %,check-%, $(check-block-y))
-endif
+check-block:
check-build: build-unit
check-clean:
rm -f tests/test-qapi-gen-timestamp
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
-check: check-block check-unit
+check: check-unit
clean: check-clean
# Build the help program automatically
-all: $(QEMU_IOTESTS_HELPERS-y)
-
-include $(wildcard tests/*.d)
endif
+if have_system and 'CONFIG_POSIX' in config_host
+ subdir('qemu-iotests')
+endif
+
test('decodetree', sh,
args: [ files('decode/check.sh'), config_host['PYTHON'], files('../scripts/decodetree.py') ],
workdir: meson.current_source_dir() / 'decode',
--- /dev/null
+if 'CONFIG_LINUX' in config_host
+ socket_scm_helper = executable('socket_scm_helper', 'socket_scm_helper.c',
+ build_by_default: false)
+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)
+