From 154215041df085271a780a2989f4f481226e3e34 Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Fri, 19 Oct 2018 13:48:41 +0200

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>

Rebase changes (4.0.0):

- Remove testing for pseries-2.7 in endianess test

- Disable device-plug-test on s390x as it use disabled device

- Do not run cpu-plug-tests on 7.3 and older machine types

Rebase changes (4.1.0-rc0):

- removed iotests 068

Rebase changes (4.1.0-rc1):

- remove all 205 tests (unstable)

Rebase changes (4.2.0-rc0):

- partially disable hd-geo-test (requires lsi53c895a)

Merged patches (4.0.0):

- f7ffd13 Remove 7 qcow2 and luks iotests that are taking > 25 sec to run during the fast train build proce

Merged patches (4.1.0-rc0):

- 41288ff redhat: Remove raw iotest 205

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 redhat/qemu-kvm.spec.template |  2 +-

 tests/Makefile.include        | 10 +++++-----

 tests/boot-serial-test.c      |  6 +++++-

 tests/cpu-plug-test.c         |  4 ++--

 tests/e1000-test.c            |  2 ++

 tests/hd-geo-test.c           |  4 ++++

 tests/prom-env-test.c         |  4 ++++

 tests/qemu-iotests/051        | 12 ++++++------

 tests/qemu-iotests/group      |  4 ++--

 tests/test-x86-cpuid-compat.c |  2 ++

 tests/usb-hcd-xhci-test.c     |  4 ++++

 11 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include

index b483790cf3..53bdbdfee0 100644

--- a/tests/Makefile.include

+++ b/tests/Makefile.include

@@ -172,7 +172,7 @@ 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)

 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-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF)

 check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)

 check-qtest-i386-y += tests/rtc-test$(EXESUF)

@@ -230,7 +230,7 @@ check-qtest-mips64el-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)

 check-qtest-moxie-y += tests/boot-serial-test$(EXESUF)

 check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = 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)

@@ -244,8 +244,8 @@ check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF)

 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)

 check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)

 check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)

-check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)

-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)

+#check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)

+#check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)

 check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)

 check-qtest-ppc64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)

 check-qtest-ppc64-y += tests/numa-test$(EXESUF)

@@ -291,7 +291,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)

 check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)

 check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)

 check-qtest-s390x-y += tests/drive_del-test$(EXESUF)

-check-qtest-s390x-y += tests/device-plug-test$(EXESUF)

+#check-qtest-s390x-y += tests/device-plug-test$(EXESUF)

 check-qtest-s390x-y += tests/virtio-ccw-test$(EXESUF)

 check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)

 check-qtest-s390x-y += tests/migration-test$(EXESUF)

diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c

index d3a54a0ba5..33ce72b89c 100644

--- a/tests/boot-serial-test.c

+++ b/tests/boot-serial-test.c

@@ -108,19 +108,23 @@ 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", "40p", "-m 192", "Memory: 192M" },

     { "ppc64", "mac99", "", "PowerPC,970FX" },

+#endif

     { "ppc64", "pseries",

       "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken",

       "Open Firmware" },

+#if 0 /* Disabled for Red Hat Enterprise Linux */

     { "ppc64", "powernv8", "", "OPAL" },

     { "ppc64", "powernv9", "", "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 30e514bbfb..a04beae1c6 100644

--- a/tests/cpu-plug-test.c

+++ b/tests/cpu-plug-test.c

@@ -185,8 +185,8 @@ static void add_pseries_test_case(const char *mname)

     char *path;

     PlugTestData *data;

-    if (!g_str_has_prefix(mname, "pseries-") ||

-        (g_str_has_prefix(mname, "pseries-2.") && atoi(&mname[10]) < 7)) {

+    if (!g_str_has_prefix(mname, "pseries-rhel") ||

+        (g_str_has_prefix(mname, "pseries-rhel7.") && atoi(&mname[14]) < 4)) {

         return;

     }

     data = g_new(PlugTestData, 1);

diff --git a/tests/e1000-test.c b/tests/e1000-test.c

index c387984ef6..c89112d6f8 100644

--- a/tests/e1000-test.c

+++ b/tests/e1000-test.c

@@ -22,9 +22,11 @@ struct QE1000 {

 static const char *models[] = {

     "e1000",

+#if 0 /* Disabled for Red Hat Enterprise Linux */

     "e1000-82540em",

     "e1000-82544gc",

     "e1000-82545em",

+#endif

 };

 static void *e1000_get_driver(void *obj, const char *interface)

diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c

index 7e86c5416c..cc068bad87 100644

--- a/tests/hd-geo-test.c

+++ b/tests/hd-geo-test.c

@@ -732,6 +732,7 @@ static void test_override_ide(void)

     test_override(args, expected);

 }

+#if 0 /* Require lsi53c895a - not supported on RHEL */

 static void test_override_scsi(void)

 {

     TestArgs *args = create_args();

@@ -776,6 +777,7 @@ static void test_override_scsi_2_controllers(void)

     add_scsi_disk(args, 3, 1, 0, 1, 2, 0, 1, 0);

     test_override(args, expected);

 }

+#endif

 static void test_override_virtio_blk(void)

 {

@@ -951,9 +953,11 @@ int main(int argc, char **argv)

     qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);

     if (have_qemu_img()) {

         qtest_add_func("hd-geo/override/ide", test_override_ide);

+#if 0 /* Require lsi53c895a - not supported on RHEL */

         qtest_add_func("hd-geo/override/scsi", test_override_scsi);

         qtest_add_func("hd-geo/override/scsi_2_controllers",

                        test_override_scsi_2_controllers);

+#endif

         qtest_add_func("hd-geo/override/virtio_blk", test_override_virtio_blk);

         qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs);

         qtest_add_func("hd-geo/override/scsi_hot_unplug",

diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c

index 61bc1d1e7b..028d45c7d7 100644

--- a/tests/prom-env-test.c

+++ b/tests/prom-env-test.c

@@ -88,10 +88,14 @@ 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);

         if (g_test_slow()) {

+#endif

             qtest_add_data_func("prom-env/pseries", "pseries", test_machine);

+#if 0 /* Disabled for Red Hat Enterprise Linux */

         }

+#endif

     } else if (!strcmp(arch, "sparc")) {

         add_tests(sparc_machines);

     } else if (!strcmp(arch, "sparc64")) {

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051

index 53bcdbc911..b387e0c233 100755

--- a/tests/qemu-iotests/051

+++ b/tests/qemu-iotests/051

@@ -181,11 +181,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

         ;;

      *)

         ;;

@@ -234,11 +234,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 6b10a6a762..06cc734b26 100644

--- a/tests/qemu-iotests/group

+++ b/tests/qemu-iotests/group

@@ -92,7 +92,7 @@

 068 rw quick

 069 rw auto quick

 070 rw quick

-071 rw auto quick

+# 071 rw auto quick -- requires whitelisted blkverify

 072 rw auto quick

 073 rw auto quick

 074 rw auto quick

@@ -120,7 +120,7 @@

 096 rw 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 quick

 102 rw quick

diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c

index 772287bdb4..e7c075ed98 100644

--- a/tests/test-x86-cpuid-compat.c

+++ b/tests/test-x86-cpuid-compat.c

@@ -300,6 +300,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: */

@@ -350,6 +351,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 10ef9d2a91..3855873050 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(global_qtest, "xhci", "1", NULL);

 }

+#if 0 /* Disabled for Red Hat Enterprise Linux */

 static void test_usb_uas_hotplug(void)

 {

     QTestState *qts = global_qtest;

@@ -36,6 +37,7 @@ static void test_usb_uas_hotplug(void)

     qtest_qmp_device_del(qts, "scsihd");

     qtest_qmp_device_del(qts, "uas");

 }

+#endif

 static void test_usb_ccid_hotplug(void)

 {

@@ -56,7 +58,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"

-- 

2.21.0