[PULL,38/62] tests: skip block layer tests if !CONFIG_TOOLS

Message ID	1576513726-53700-39-git-send-email-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=4Qjo=2G=nongnu.org=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46A5B206D7 From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL 38/62] tests: skip block layer tests if !CONFIG_TOOLS Date: Mon, 16 Dec 2019 17:28:22 +0100 Message-Id: <1576513726-53700-39-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576513726-53700-1-git-send-email-pbonzini@redhat.com> References: <1576513726-53700-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	None \| expand [PULL,02/62] migration-test: Create cmd_soure and cmd_target [PULL,03/62] migration-test: Move hide_stderr to common commandline [PULL,04/62] migration-test: Move -machine to common commandline [PULL,05/62] migration-test: Move memory size to common commandline [PULL,06/62] migration-test: Move shmem handling to common commandline [PULL,07/62] migration-test: Move -name handling to common commandline [PULL,08/62] migration-test: Move -serial handling to common commandline [PULL,09/62] migration-test: Move -incomming handling to common commandline [PULL,10/62] migration-test: Rename cmd_src/dst to arch_source/arch_target [PULL,11/62] migration-test: Use a struct for test_migrate_start parameters [PULL,12/62] memory: do not look at current_machine->accel [PULL,13/62] vl: move icount configuration earlier [PULL,14/62] tcg: move qemu_tcg_configure to accel/tcg/tcg-all.c [PULL,15/62] vl: extract accelerator option processing to a separate function [PULL,16/62] vl: merge -accel processing into configure_accelerators [PULL,17/62] accel: compile accel/accel.c just once [PULL,18/62] vl: introduce object_parse_property_opt [PULL,19/62] vl: configure accelerators from -accel options [PULL,20/62] vl: warn for unavailable accelerators, clarify messages [PULL,21/62] qom: introduce object_register_sugar_prop [PULL,22/62] qom: add object_new_with_class [PULL,23/62] accel: pass object to accel_init_machine [PULL,24/62] tcg: convert "-accel threads" to a QOM property [PULL,25/62] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size" [PULL,26/62] xen: convert "-machine igd-passthru" to an accelerator property [PULL,27/62] kvm: convert "-machine kvm_shadow_mem" to an accelerator property [PULL,28/62] kvm: introduce kvm_kernel_irqchip_* functions [PULL,29/62] kvm: convert "-machine kernel_irqchip" to an accelerator property [PULL,30/62] Makefile: remove unused variables [PULL,31/62] object: Improve documentation of interfaces [PULL,32/62] build-sys: build vhost-user-gpu only if CONFIG_TOOLS [PULL,33/62] build-sys: do not include Windows SLIRP dependencies in $LIBS [PULL,34/62] migration: fix maybe-uninitialized warning [PULL,35/62] monitor: fix maybe-uninitialized [PULL,36/62] vhost-user-scsi: fix printf format warning [PULL,37/62] os-posix: simplify os_find_datadir [PULL,38/62] tests: skip block layer tests if !CONFIG_TOOLS [PULL,39/62] libvixl: remove per-target compiler flags [PULL,40/62] crypto: move common bits for all emulators to libqemuutil [PULL,41/62] stubs: replace stubs with lnot if applicable [PULL,42/62] configure: set $PYTHON to a full path [PULL,43/62] configure: simplify vhost condition with Kconfig [PULL,44/62] i386: conditionally compile more files [PULL,45/62] fw_cfg: allow building without other devices [PULL,46/62] hw: replace hw/i386/pc.h with a header just for the i8259 [PULL,47/62] pci-stub: add more MSI functions [PULL,48/62] x86: move SMM property to X86MachineState [PULL,49/62] hw/i386/pc: Convert DPRINTF() to trace events [PULL,50/62] x86: move more x86-generic functions out of PC files [PULL,51/62] acpi: move PC stubs out of stubs/ [PULL,52/62] pc: stubify x86 iommu [PULL,53/62] hw/i386: De-duplicate gsi_handler() to remove kvm_pc_gsi_handler() [PULL,54/62] hw/i386: Simplify ioapic_init_gsi() [PULL,55/62] hw/isa/isa-bus: cleanup irq functions [PULL,56/62] hw/i386/pc: Use TYPE_PORT92 instead of hardcoded string [PULL,57/62] hw/i386/pc: Inline port92_init() [PULL,58/62] hw/i386/pc: Extract the port92 device [PULL,59/62] hyperv: Use auto rcu_read macros [PULL,60/62] qsp: Use WITH_RCU_READ_LOCK_GUARD [PULL,61/62] memory: use RCU_READ_LOCK_GUARD [PULL,62/62] colo: fix return without releasing RCU

Message ID

1576513726-53700-39-git-send-email-pbonzini@redhat.com (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46A5B206D7
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 38/62] tests: skip block layer tests if !CONFIG_TOOLS
Date: Mon, 16 Dec 2019 17:28:22 +0100
Message-Id: <1576513726-53700-39-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1576513726-53700-1-git-send-email-pbonzini@redhat.com>
References: <1576513726-53700-1-git-send-email-pbonzini@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>
Errors-To: 
 qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org
Sender: "Qemu-devel"
 <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>

Series

None | expand

Commit Message

Paolo Bonzini Dec. 16, 2019, 4:28 p.m. UTC

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, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8566f5f..7457be9 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -169,7 +169,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)
@@ -1193,7 +1193,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)

[PULL,38/62] tests: skip block layer tests if !CONFIG_TOOLS

Commit Message

Patch