* [PATCH] tests: skip block layer tests if !CONFIG_TOOLS
@ 2019-12-11 14:24 Paolo Bonzini
2019-12-11 14:45 ` Thomas Huth
0 siblings, 1 reply; 2+ messages in thread
From: Paolo Bonzini @ 2019-12-11 14:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, qemu-block
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
tests/Makefile.include | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8566f5f..f07c761 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -169,7 +169,9 @@ 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)
+ifeq ($(CONFIG_TOOLS),y)
check-qtest-i386-y += tests/ahci-test$(EXESUF)
+endif
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)
@@ -1193,7 +1195,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)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tests: skip block layer tests if !CONFIG_TOOLS
2019-12-11 14:24 [PATCH] tests: skip block layer tests if !CONFIG_TOOLS Paolo Bonzini
@ 2019-12-11 14:45 ` Thomas Huth
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Huth @ 2019-12-11 14:45 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Marc-André Lureau, qemu-block
On 11/12/2019 15.24, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> 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>
> ---
> tests/Makefile.include | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 8566f5f..f07c761 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -169,7 +169,9 @@ 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)
> +ifeq ($(CONFIG_TOOLS),y)
> check-qtest-i386-y += tests/ahci-test$(EXESUF)
> +endif
Please use "check-qtest-i386-$(CONFIG_TOOLS) += ..." instead.
Thomas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-11 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-11 14:24 [PATCH] tests: skip block layer tests if !CONFIG_TOOLS Paolo Bonzini
2019-12-11 14:45 ` Thomas Huth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).