From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Li Qiang" <liq3ea@163.com>
Subject: [Qemu-devel] [PULL 05/25] tests/Makefile: Use some more CONFIG switches for x86 tests
Date: Mon, 14 Jan 2019 11:02:00 +0100 [thread overview]
Message-ID: <1547460140-1473-6-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1547460140-1473-1-git-send-email-thuth@redhat.com>
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 c17f6d5..462b5e0 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
next prev parent reply other threads:[~2019-01-14 10:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 10:01 [Qemu-devel] [PULL 00/25] ivshmem deprecation, qtests, typedefs and gnu99 Thomas Huth
2019-01-14 10:01 ` [Qemu-devel] [PULL 01/25] hw/misc/ivshmem: Remove deprecated "ivshmem" legacy device Thomas Huth
2019-01-14 10:01 ` [Qemu-devel] [PULL 02/25] tests: vhost-user-test: initialize 'fd' in chr_read Thomas Huth
2019-01-14 10:01 ` [Qemu-devel] [PULL 03/25] vhost-user: fix ioeventfd_enabled Thomas Huth
2019-01-14 10:01 ` [Qemu-devel] [PULL 04/25] util: check the return value of fcntl in qemu_set_{block, nonblock} Thomas Huth
2019-01-14 10:02 ` Thomas Huth [this message]
2019-01-14 10:02 ` [Qemu-devel] [PULL 06/25] tests/Makefile: Use some more CONFIG switches for ppc tests Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 07/25] tests/endianesss: Make test independent of global_qtest Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 08/25] tests/boot-order: " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 09/25] tests/pnv-xscom: " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 10/25] hw/input/ps2: Remove PS2State from "qemu/typedefs.h" Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 11/25] hw/pcmcia: Remove PCMCIACardState " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 12/25] hw/ssi: Remove SSIBus " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 13/25] hw/ide/ahci: Remove AllwinnerAHCIState " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 14/25] hw/i2c/smbus: Remove SMBusDevice " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 15/25] hw/bt: Remove HCIInfo " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 16/25] hw/char/serial: Remove SerialState " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 17/25] hw/i386: Remove PCMachineClass " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 18/25] audio: Remove AudioState " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 19/25] ui/console: Remove QemuDmaBuf " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 20/25] ui/console: Remove DisplayState/DisplaySurface " Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 21/25] linux-user: Fix compilation with clang 3.4 Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 22/25] ppc: Move spapr-related prototypes from xics.h into a seperate header file Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 23/25] ppc: Fix duplicated typedefs to be able to compile with Clang in gnu99 mode Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 24/25] configure: Force the C standard to gnu99 Thomas Huth
2019-01-14 10:02 ` [Qemu-devel] [PULL 25/25] tests/hexloader-test: Don't pass -nographic to the QEMU under test Thomas Huth
2019-01-14 12:52 ` [Qemu-devel] [PULL 00/25] ivshmem deprecation, qtests, typedefs and gnu99 Peter Maydell
2019-01-14 12:58 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1547460140-1473-6-git-send-email-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=f4bug@amsat.org \
--cc=liq3ea@163.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).