To be able to build and test QEMU binaries where certain devices are
disabled, we have to use the right CONFIG_* switches to run certain
tests only if the corresponding device really has been compiled into
the binary.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index fb0b449..d87b403 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -165,13 +165,13 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)
check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
-check-qtest-pci-y += $(check-qtest-virtio-y)
+check-qtest-pci-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)
check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)
check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
-check-qtest-pci-y += tests/display-vga-test$(EXESUF)
+check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
-check-qtest-pci-y += tests/megasas-test$(EXESUF)
+check-qtest-pci-$(CONFIG_MEGASAS_SCSI_PCI) += tests/megasas-test$(EXESUF)
check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
@@ -183,8 +183,8 @@ check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
check-qtest-i386-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF)
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
-check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
-check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
+check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += tests/ipmi-kcs-test$(EXESUF)
+check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += tests/ipmi-bt-test$(EXESUF)
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
--
1.8.3.1
On 29/11/18 11:25, Thomas Huth wrote: > To be able to build and test QEMU binaries where certain devices are > disabled, we have to use the right CONFIG_* switches to run certain > tests only if the corresponding device really has been compiled into > the binary. > > Signed-off-by: Thomas Huth <thuth@redhat.com> No objection, but CONFIG_VIRTIO and CONFIG_MEGASAS_SCSI_PCI would not be needed with qgraph (which I'm going to post Real Soon Now). Paolo > --- > tests/Makefile.include | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index fb0b449..d87b403 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -165,13 +165,13 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) > check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF) > check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF) > check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF) > -check-qtest-pci-y += $(check-qtest-virtio-y) > +check-qtest-pci-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y) > check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF) > check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y) > -check-qtest-pci-y += tests/display-vga-test$(EXESUF) > +check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF) > check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF) > check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF) > -check-qtest-pci-y += tests/megasas-test$(EXESUF) > +check-qtest-pci-$(CONFIG_MEGASAS_SCSI_PCI) += tests/megasas-test$(EXESUF) > > check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) > check-qtest-i386-y += tests/fdc-test$(EXESUF) > @@ -183,8 +183,8 @@ check-qtest-i386-y += tests/bios-tables-test$(EXESUF) > check-qtest-i386-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF) > check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) > check-qtest-i386-y += tests/rtc-test$(EXESUF) > -check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF) > -check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF) > +check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += tests/ipmi-kcs-test$(EXESUF) > +check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += tests/ipmi-bt-test$(EXESUF) > check-qtest-i386-y += tests/i440fx-test$(EXESUF) > check-qtest-i386-y += tests/fw_cfg-test$(EXESUF) > check-qtest-i386-y += tests/drive_del-test$(EXESUF) >
© 2016 - 2024 Red Hat, Inc.