tests: skip block layer tests if !CONFIG_TOOLS

[PATCH] tests: skip block layer tests if !CONFIG_TOOLS

Paolo Bonzini posted 1 patch 4 years, 4 months ago

Download mbox

Test docker-mingw@fedora failed

Test docker-clang@ubuntu failed

Test docker-quick@centos7 failed

Test asan failed

Test checkpatch failed

Test FreeBSD failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1576074293-53357-1-git-send-email-pbonzini@redhat.com

tests/Makefile.include | 4 ++++
1 file changed, 4 insertions(+)

Expand all Fold all

[PATCH] tests: skip block layer tests if !CONFIG_TOOLS

Posted by Paolo Bonzini 4 years, 4 months ago

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

Re: [PATCH] tests: skip block layer tests if !CONFIG_TOOLS

Posted by Thomas Huth 4 years, 4 months ago

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