diff options
| author | Marc-André Lureau | 2019-09-03 10:30:48 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-12-17 19:32:48 +0100 |
| commit | ee6fe0532c0618e3e556ab1c1c5a24a8aa5f834b (patch) | |
| tree | 3c3f83181bc29237739cb82ecbb42f781f40e868 | |
| parent | os-posix: simplify os_find_datadir (diff) | |
| download | qemu-ee6fe0532c0618e3e556ab1c1c5a24a8aa5f834b.tar.gz qemu-ee6fe0532c0618e3e556ab1c1c5a24a8aa5f834b.tar.xz qemu-ee6fe0532c0618e3e556ab1c1c5a24a8aa5f834b.zip | |
tests: skip block layer tests if !CONFIG_TOOLS
The block tests, as well as ahci-test needs qemu-img. Do not run
them if it wasn't built.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | tests/Makefile.include | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index b381387048..31b86674e5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -167,7 +167,7 @@ check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF) check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) check-qtest-i386-y += tests/fdc-test$(EXESUF) check-qtest-i386-y += tests/ide-test$(EXESUF) -check-qtest-i386-y += tests/ahci-test$(EXESUF) +check-qtest-i386-$(CONFIG_TOOLS) += tests/ahci-test$(EXESUF) check-qtest-i386-y += tests/hd-geo-test$(EXESUF) check-qtest-i386-y += tests/boot-order-test$(EXESUF) check-qtest-i386-y += tests/bios-tables-test$(EXESUF) @@ -1191,7 +1191,9 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) .PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) +ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) +endif check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) |