499 lines
24 KiB
Diff
499 lines
24 KiB
Diff
From f4e3d697cb6a18301b1279c0b07896eb5b228aa9 Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
Date: Thu, 8 Nov 2018 12:03:48 +0100
|
|
Subject: Enable make check
|
|
|
|
Fixing tests after device disabling and machine types changes and enabling
|
|
make check run during build.
|
|
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
redhat/qemu-kvm.spec.template | 2 +-
|
|
tests/Makefile.include | 123 +++++++++++++++++++++---------------------
|
|
tests/boot-serial-test.c | 6 ++-
|
|
tests/cpu-plug-test.c | 3 +-
|
|
tests/e1000-test.c | 2 +
|
|
tests/endianness-test.c | 2 +
|
|
tests/prom-env-test.c | 2 +
|
|
tests/qemu-iotests/051 | 12 ++---
|
|
tests/qemu-iotests/group | 4 +-
|
|
tests/qom-test.c | 2 +-
|
|
tests/test-x86-cpuid-compat.c | 2 +
|
|
tests/usb-hcd-xhci-test.c | 4 ++
|
|
12 files changed, 91 insertions(+), 73 deletions(-)
|
|
|
|
diff --git a/tests/Makefile.include b/tests/Makefile.include
|
|
index a492827..4b78396 100644
|
|
--- a/tests/Makefile.include
|
|
+++ b/tests/Makefile.include
|
|
@@ -184,8 +184,8 @@ gcov-files-generic-y = qdev-monitor.c qmp.c
|
|
check-qtest-generic-y += tests/cdrom-test$(EXESUF)
|
|
|
|
gcov-files-ipack-y += hw/ipack/ipack.c
|
|
-check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
|
-gcov-files-ipack-y += hw/char/ipoctal232.c
|
|
+#check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
|
+#gcov-files-ipack-y += hw/char/ipoctal232.c
|
|
|
|
check-qtest-virtioserial-y += tests/virtio-console-test$(EXESUF)
|
|
gcov-files-virtioserial-y += hw/char/virtio-console.c
|
|
@@ -217,23 +217,23 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF)
|
|
gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
|
|
check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
|
|
gcov-files-pci-y += hw/net/rtl8139.c
|
|
-check-qtest-pci-y += tests/pcnet-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/net/pcnet.c
|
|
-gcov-files-pci-y += hw/net/pcnet-pci.c
|
|
-check-qtest-pci-y += tests/eepro100-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/net/eepro100.c
|
|
-check-qtest-pci-y += tests/ne2000-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/net/ne2000.c
|
|
-check-qtest-pci-y += tests/nvme-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/block/nvme.c
|
|
+#check-qtest-pci-y += tests/pcnet-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/net/pcnet.c
|
|
+#gcov-files-pci-y += hw/net/pcnet-pci.c
|
|
+#check-qtest-pci-y += tests/eepro100-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/net/eepro100.c
|
|
+#check-qtest-pci-y += tests/ne2000-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/net/ne2000.c
|
|
+#check-qtest-pci-y += tests/nvme-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/block/nvme.c
|
|
check-qtest-pci-y += tests/ac97-test$(EXESUF)
|
|
gcov-files-pci-y += hw/audio/ac97.c
|
|
-check-qtest-pci-y += tests/es1370-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/audio/es1370.c
|
|
+#check-qtest-pci-y += tests/es1370-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/audio/es1370.c
|
|
check-qtest-pci-y += $(check-qtest-virtio-y)
|
|
gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
|
|
-check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/ipack/tpci200.c
|
|
+#check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/ipack/tpci200.c
|
|
check-qtest-pci-y += $(check-qtest-ipack-y)
|
|
gcov-files-pci-y += $(gcov-files-ipack-y)
|
|
check-qtest-pci-y += tests/display-vga-test$(EXESUF)
|
|
@@ -245,25 +245,25 @@ gcov-files-pci-y += hw/display/virtio-gpu-pci.c
|
|
gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
|
|
check-qtest-pci-y += tests/intel-hda-test$(EXESUF)
|
|
gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c
|
|
-check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/misc/ivshmem.c
|
|
-check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
|
-gcov-files-pci-y += hw/scsi/megasas.c
|
|
+check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
|
|
+gcov-files-pci-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
|
|
+#check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
|
+#gcov-files-pci-y += hw/scsi/megasas.c
|
|
|
|
check-qtest-i386-y = tests/endianness-test$(EXESUF)
|
|
-check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
|
-gcov-files-i386-y = hw/block/fdc.c
|
|
+#check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
|
+#gcov-files-i386-y = hw/block/fdc.c
|
|
check-qtest-i386-y += tests/ide-test$(EXESUF)
|
|
check-qtest-i386-y += tests/ahci-test$(EXESUF)
|
|
check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
|
|
gcov-files-i386-y += hw/block/hd-geometry.c
|
|
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
|
|
-check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
|
+#check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
|
check-qtest-i386-y += 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-y += tests/ipmi-kcs-test$(EXESUF)
|
|
+#check-qtest-i386-y += 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)
|
|
@@ -272,8 +272,8 @@ check-qtest-i386-y += tests/tco-test$(EXESUF)
|
|
gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
|
|
check-qtest-i386-y += $(check-qtest-pci-y)
|
|
gcov-files-i386-y += $(gcov-files-pci-y)
|
|
-check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
|
|
-gcov-files-i386-y += hw/net/vmxnet3.c
|
|
+#check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
|
|
+#gcov-files-i386-y += hw/net/vmxnet3.c
|
|
gcov-files-i386-y += hw/net/net_rx_pkt.c
|
|
gcov-files-i386-y += hw/net/net_tx_pkt.c
|
|
check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
|
|
@@ -282,8 +282,8 @@ check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
|
|
gcov-files-i386-y += hw/pci-bridge/i82801b11.c
|
|
check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
|
|
gcov-files-i386-y += hw/pci-bridge/ioh3420.c
|
|
-check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
-gcov-files-i386-y += hw/usb/hcd-ohci.c
|
|
+#check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
+#gcov-files-i386-y += hw/usb/hcd-ohci.c
|
|
check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
gcov-files-i386-y += hw/usb/hcd-uhci.c
|
|
check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
|
|
@@ -311,7 +311,7 @@ check-qtest-i386-y += tests/migration-test$(EXESUF)
|
|
check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
|
|
check-qtest-i386-y += tests/numa-test$(EXESUF)
|
|
check-qtest-x86_64-y += $(check-qtest-i386-y)
|
|
-check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
|
|
+#check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
|
|
gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
|
|
gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
|
|
|
|
@@ -332,34 +332,35 @@ check-qtest-mips64el-y = tests/endianness-test$(EXESUF)
|
|
check-qtest-moxie-y = tests/boot-serial-test$(EXESUF)
|
|
|
|
check-qtest-ppc-y = tests/endianness-test$(EXESUF)
|
|
-check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
|
+#check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
|
check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
|
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
|
|
check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
|
|
-check-qtest-ppc-y += tests/m48t59-test$(EXESUF)
|
|
-gcov-files-ppc-y += hw/timer/m48t59.c
|
|
+#check-qtest-ppc-y += tests/m48t59-test$(EXESUF)
|
|
+#gcov-files-ppc-y += hw/timer/m48t59.c
|
|
|
|
check-qtest-ppc64-y = $(check-qtest-ppc-y)
|
|
gcov-files-ppc64-y = $(subst ppc-softmmu/,ppc64-softmmu/,$(gcov-files-ppc-y))
|
|
check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
|
|
gcov-files-ppc64-y += ppc64-softmmu/hw/ppc/spapr_pci.c
|
|
-check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
|
|
+#check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
|
|
check-qtest-ppc64-y += tests/migration-test$(EXESUF)
|
|
check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
|
|
check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
|
|
-check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
-gcov-files-ppc64-y += hw/usb/hcd-ohci.c
|
|
-check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
-gcov-files-ppc64-y += hw/usb/hcd-uhci.c
|
|
+#check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
+#gcov-files-ppc64-y += hw/usb/hcd-ohci.c
|
|
+#check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
+#gcov-files-ppc64-y += hw/usb/hcd-uhci.c
|
|
check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
|
|
gcov-files-ppc64-y += hw/usb/hcd-xhci.c
|
|
check-qtest-ppc64-y += $(check-qtest-virtio-y)
|
|
-check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
|
|
-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
|
|
-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
|
|
+#check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
|
|
+#check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
|
|
+#check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
|
|
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
|
|
check-qtest-ppc64-y += tests/numa-test$(EXESUF)
|
|
-check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
+check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
|
|
+gcov-files-ppc64-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
|
|
check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
|
|
|
|
check-qtest-sh4-y = tests/endianness-test$(EXESUF)
|
|
@@ -388,7 +389,7 @@ check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
|
|
check-qtest-arm-y += tests/sdhci-test$(EXESUF)
|
|
|
|
check-qtest-aarch64-y = tests/numa-test$(EXESUF)
|
|
-check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
|
|
+#check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
|
|
check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
|
|
|
|
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
|
|
@@ -777,15 +778,15 @@ tests/endianness-test$(EXESUF): tests/endianness-test.o
|
|
tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
|
|
tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
|
|
tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
|
|
-tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
+#tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
|
|
tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
|
|
-tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
|
|
-tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
|
|
+#tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
|
|
+#tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
|
|
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
|
tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
|
|
tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y)
|
|
-tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
|
|
+#tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
|
|
tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y)
|
|
tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y)
|
|
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
|
@@ -798,11 +799,11 @@ tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
|
tests/e1000-test$(EXESUF): tests/e1000-test.o
|
|
tests/e1000e-test$(EXESUF): tests/e1000e-test.o $(libqos-pc-obj-y)
|
|
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
|
|
-tests/pcnet-test$(EXESUF): tests/pcnet-test.o
|
|
-tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
|
-tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
|
-tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
|
-tests/ne2000-test$(EXESUF): tests/ne2000-test.o
|
|
+#tests/pcnet-test$(EXESUF): tests/pcnet-test.o
|
|
+#tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
|
+#tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
|
+#tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
|
+#tests/ne2000-test$(EXESUF): tests/ne2000-test.o
|
|
tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
|
|
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
|
|
tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o $(libqos-virtio-obj-y)
|
|
@@ -813,22 +814,22 @@ tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y)
|
|
tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)
|
|
tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o $(libqos-virtio-obj-y)
|
|
tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o $(libqos-virtio-obj-y)
|
|
-tests/tpci200-test$(EXESUF): tests/tpci200-test.o
|
|
+#tests/tpci200-test$(EXESUF): tests/tpci200-test.o
|
|
tests/display-vga-test$(EXESUF): tests/display-vga-test.o
|
|
-tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
|
|
+#tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
|
|
tests/qom-test$(EXESUF): tests/qom-test.o
|
|
tests/test-hmp$(EXESUF): tests/test-hmp.o
|
|
tests/machine-none-test$(EXESUF): tests/machine-none-test.o
|
|
tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y)
|
|
tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)
|
|
-tests/nvme-test$(EXESUF): tests/nvme-test.o
|
|
+#tests/nvme-test$(EXESUF): tests/nvme-test.o
|
|
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
|
|
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
|
|
tests/ac97-test$(EXESUF): tests/ac97-test.o
|
|
-tests/es1370-test$(EXESUF): tests/es1370-test.o
|
|
+#tests/es1370-test$(EXESUF): tests/es1370-test.o
|
|
tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o
|
|
tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o
|
|
-tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
|
|
+#tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
|
|
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
|
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
|
|
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
|
|
@@ -841,19 +842,19 @@ tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_hel
|
|
tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
|
|
tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y)
|
|
tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
|
|
-tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
|
|
-tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
|
|
-tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
|
|
+#tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
|
|
+#tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
|
|
+#tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
|
|
tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)
|
|
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
|
|
-tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
|
|
+#tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
|
|
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
|
|
tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
|
|
tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
|
|
tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
|
|
tests/numa-test$(EXESUF): tests/numa-test.o
|
|
tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o tests/acpi-utils.o
|
|
-tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y)
|
|
+#tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y)
|
|
tests/cdrom-test$(EXESUF): tests/cdrom-test.o tests/boot-sector.o $(libqos-obj-y)
|
|
|
|
tests/migration/stress$(EXESUF): tests/migration/stress.o
|
|
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
|
|
index 952a2e7..5217a39 100644
|
|
--- a/tests/boot-serial-test.c
|
|
+++ b/tests/boot-serial-test.c
|
|
@@ -80,17 +80,21 @@ static testdef_t tests[] = {
|
|
{ "ppc", "g3beige", "", "PowerPC,750" },
|
|
{ "ppc", "mac99", "", "PowerPC,G4" },
|
|
{ "ppc", "sam460ex", "-m 256", "DRAM: 256 MiB" },
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
{ "ppc64", "ppce500", "", "U-Boot" },
|
|
{ "ppc64", "prep", "-boot e", "Booting from device e" },
|
|
{ "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
|
|
{ "ppc64", "mac99", "", "PowerPC,970FX" },
|
|
+#endif
|
|
{ "ppc64", "pseries", "", "Open Firmware" },
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
{ "ppc64", "powernv", "-cpu POWER8", "OPAL" },
|
|
{ "ppc64", "sam460ex", "-device e1000", "8086 100e" },
|
|
+#endif
|
|
{ "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
{ "i386", "pc", "-device sga", "SGABIOS" },
|
|
{ "i386", "q35", "-device sga", "SGABIOS" },
|
|
- { "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
+ { "x86_64", "pc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
{ "x86_64", "q35", "-device sga", "SGABIOS" },
|
|
{ "sparc", "LX", "", "TMS390S10" },
|
|
{ "sparc", "SS-4", "", "MB86904" },
|
|
diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
|
|
index 5f39ba0..48b8d09 100644
|
|
--- a/tests/cpu-plug-test.c
|
|
+++ b/tests/cpu-plug-test.c
|
|
@@ -192,7 +192,8 @@ static void add_pseries_test_case(const char *mname)
|
|
PlugTestData *data;
|
|
|
|
if (!g_str_has_prefix(mname, "pseries-") ||
|
|
- (g_str_has_prefix(mname, "pseries-2.") && atoi(&mname[10]) < 7)) {
|
|
+ (g_str_has_prefix(mname, "pseries-2.") && atoi(&mname[10]) < 7) ||
|
|
+ strcmp(mname,"pseries-rhel7.2.0") == 0) {
|
|
return;
|
|
}
|
|
data = g_new(PlugTestData, 1);
|
|
diff --git a/tests/e1000-test.c b/tests/e1000-test.c
|
|
index 0c5fcdc..b830432 100644
|
|
--- a/tests/e1000-test.c
|
|
+++ b/tests/e1000-test.c
|
|
@@ -29,8 +29,10 @@ static void test_device(gconstpointer data)
|
|
static const char *models[] = {
|
|
"e1000",
|
|
"e1000-82540em",
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
"e1000-82544gc",
|
|
"e1000-82545em",
|
|
+#endif
|
|
};
|
|
|
|
int main(int argc, char **argv)
|
|
diff --git a/tests/endianness-test.c b/tests/endianness-test.c
|
|
index 546e096..440353d 100644
|
|
--- a/tests/endianness-test.c
|
|
+++ b/tests/endianness-test.c
|
|
@@ -37,10 +37,12 @@ static const TestCase test_cases[] = {
|
|
{ "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
|
|
{ "ppc", "prep", 0x80000000, .bswap = true },
|
|
{ "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },
|
|
+#if 0 /* Disabled for RHEL, since ISA is not enabled */
|
|
{ "ppc64", "mac99", 0xf2000000, .bswap = true, .superio = "i82378" },
|
|
{ "ppc64", "pseries", (1ULL << 45), .bswap = true, .superio = "i82378" },
|
|
{ "ppc64", "pseries-2.7", 0x10080000000ULL,
|
|
.bswap = true, .superio = "i82378" },
|
|
+#endif /* Disabled for RHEL, since ISA is not enabled */
|
|
{ "sh4", "r2d", 0xfe240000, .superio = "i82378" },
|
|
{ "sh4eb", "r2d", 0xfe240000, .bswap = true, .superio = "i82378" },
|
|
{ "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true },
|
|
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c
|
|
index 8c867e6..cc9b6ec 100644
|
|
--- a/tests/prom-env-test.c
|
|
+++ b/tests/prom-env-test.c
|
|
@@ -82,7 +82,9 @@ int main(int argc, char *argv[])
|
|
if (!strcmp(arch, "ppc")) {
|
|
add_tests(ppc_machines);
|
|
} else if (!strcmp(arch, "ppc64")) {
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
add_tests(ppc_machines);
|
|
+#endif
|
|
if (g_test_slow()) {
|
|
qtest_add_data_func("prom-env/pseries", "pseries", test_machine);
|
|
}
|
|
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
index ee9c820..c5cc0ee 100755
|
|
--- a/tests/qemu-iotests/051
|
|
+++ b/tests/qemu-iotests/051
|
|
@@ -183,11 +183,11 @@ run_qemu -drive if=virtio
|
|
case "$QEMU_DEFAULT_MACHINE" in
|
|
pc)
|
|
run_qemu -drive if=none,id=disk -device ide-cd,drive=disk
|
|
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
run_qemu -drive if=none,id=disk -device ide-drive,drive=disk
|
|
run_qemu -drive if=none,id=disk -device ide-hd,drive=disk
|
|
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
;;
|
|
*)
|
|
;;
|
|
@@ -212,11 +212,11 @@ run_qemu -drive file="$TEST_IMG",if=virtio,readonly=on
|
|
case "$QEMU_DEFAULT_MACHINE" in
|
|
pc)
|
|
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-cd,drive=disk
|
|
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-drive,drive=disk
|
|
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-hd,drive=disk
|
|
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
;;
|
|
*)
|
|
;;
|
|
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
|
index b973dc8..f1059f6 100644
|
|
--- a/tests/qemu-iotests/group
|
|
+++ b/tests/qemu-iotests/group
|
|
@@ -77,7 +77,7 @@
|
|
068 rw auto quick
|
|
069 rw auto quick
|
|
070 rw auto quick
|
|
-071 rw auto quick
|
|
+# 071 rw auto quick -- requires whitelisted blkverify
|
|
072 rw auto quick
|
|
073 rw auto quick
|
|
074 rw auto quick
|
|
@@ -105,7 +105,7 @@
|
|
096 rw auto quick
|
|
097 rw auto backing
|
|
098 rw auto backing quick
|
|
-099 rw auto quick
|
|
+# 099 rw auto quick -- requires whitelisted blkverify
|
|
# 100 was removed, do not reuse
|
|
101 rw auto quick
|
|
102 rw auto quick
|
|
diff --git a/tests/qom-test.c b/tests/qom-test.c
|
|
index e6f712c..ebd15fd 100644
|
|
--- a/tests/qom-test.c
|
|
+++ b/tests/qom-test.c
|
|
@@ -16,7 +16,7 @@
|
|
#include "libqtest.h"
|
|
|
|
static const char *blacklist_x86[] = {
|
|
- "xenfv", "xenpv", NULL
|
|
+ "xenfv", "xenpv", "isapc", NULL
|
|
};
|
|
|
|
static const struct {
|
|
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
|
|
index 84ce9c7..c1ee197 100644
|
|
--- a/tests/test-x86-cpuid-compat.c
|
|
+++ b/tests/test-x86-cpuid-compat.c
|
|
@@ -306,6 +306,7 @@ int main(int argc, char **argv)
|
|
"-cpu 486,xlevel2=0xC0000002,+xstore",
|
|
"xlevel2", 0xC0000002);
|
|
|
|
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
/* Check compatibility of old machine-types that didn't
|
|
* auto-increase level/xlevel/xlevel2: */
|
|
|
|
@@ -356,6 +357,7 @@ int main(int argc, char **argv)
|
|
add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on",
|
|
"-machine pc-i440fx-2.4 -cpu SandyBridge,+npt",
|
|
"xlevel", 0x80000008);
|
|
+#endif
|
|
|
|
/* Test feature parsing */
|
|
add_feature_test("x86/cpuid/features/plus",
|
|
diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
|
|
index 5b1b681..85fa150 100644
|
|
--- a/tests/usb-hcd-xhci-test.c
|
|
+++ b/tests/usb-hcd-xhci-test.c
|
|
@@ -21,6 +21,7 @@ static void test_xhci_hotplug(void)
|
|
usb_test_hotplug("xhci", 1, NULL);
|
|
}
|
|
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
static void test_usb_uas_hotplug(void)
|
|
{
|
|
qtest_qmp_device_add("usb-uas", "uas", NULL);
|
|
@@ -34,6 +35,7 @@ static void test_usb_uas_hotplug(void)
|
|
qtest_qmp_device_del("scsihd");
|
|
qtest_qmp_device_del("uas");
|
|
}
|
|
+#endif
|
|
|
|
static void test_usb_ccid_hotplug(void)
|
|
{
|
|
@@ -52,7 +54,9 @@ int main(int argc, char **argv)
|
|
|
|
qtest_add_func("/xhci/pci/init", test_xhci_init);
|
|
qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
|
|
+#endif
|
|
qtest_add_func("/xhci/pci/hotplug/usb-ccid", test_usb_ccid_hotplug);
|
|
|
|
qtest_start("-device nec-usb-xhci,id=xhci"
|
|
--
|
|
1.8.3.1
|
|
|