323 lines
13 KiB
Diff
323 lines
13 KiB
Diff
From 7b8ca8c1cbd3763900e3e472556116c9832e06f8 Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
Date: Wed, 2 Sep 2020 09:39: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)
|
|
|
|
Rebase changes (5.1.0-rc1):
|
|
- Disable qtest/q35-test (uses upstream machine types)
|
|
- Do not run iotests on make checka
|
|
- Enabled iotests 071 and 099
|
|
|
|
Rebase changes (5.2.0 rc0):
|
|
- Disable cdrom tests (unsupported devices) on x86_64
|
|
- disable fuzz test
|
|
|
|
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
|
|
|
|
Conflicts:
|
|
redhat/qemu-kvm.spec.template
|
|
---
|
|
redhat/qemu-kvm.spec.template | 4 ++--
|
|
tests/qemu-iotests/051 | 12 ++++++------
|
|
tests/qtest/boot-serial-test.c | 6 +++++-
|
|
tests/qtest/cdrom-test.c | 2 ++
|
|
tests/qtest/cpu-plug-test.c | 4 ++--
|
|
tests/qtest/e1000-test.c | 2 ++
|
|
tests/qtest/hd-geo-test.c | 4 ++++
|
|
tests/qtest/meson.build | 10 ++--------
|
|
tests/qtest/prom-env-test.c | 4 ++++
|
|
tests/qtest/test-x86-cpuid-compat.c | 2 ++
|
|
tests/qtest/usb-hcd-xhci-test.c | 4 ++++
|
|
11 files changed, 35 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
index bee26075b2..61d25c4ed7 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
|
|
;;
|
|
*)
|
|
;;
|
|
@@ -236,11 +236,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/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
|
|
index b6b1c23cd0..cefa1b38b7 100644
|
|
--- a/tests/qtest/boot-serial-test.c
|
|
+++ b/tests/qtest/boot-serial-test.c
|
|
@@ -120,19 +120,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 " PSERIES_DEFAULT_CAPABILITIES,
|
|
"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/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
|
|
index 5af944a5fb..cd5b8e0f16 100644
|
|
--- a/tests/qtest/cdrom-test.c
|
|
+++ b/tests/qtest/cdrom-test.c
|
|
@@ -140,6 +140,7 @@ static void add_x86_tests(void)
|
|
qtest_add_data_func("cdrom/boot/isapc", "-M isapc "
|
|
"-drive if=ide,media=cdrom,file=", test_cdboot);
|
|
}
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
qtest_add_data_func("cdrom/boot/am53c974",
|
|
"-device am53c974 -device scsi-cd,drive=cd1 "
|
|
"-drive if=none,id=cd1,format=raw,file=", test_cdboot);
|
|
@@ -155,6 +156,7 @@ static void add_x86_tests(void)
|
|
qtest_add_data_func("cdrom/boot/megasas-gen2", "-M q35 "
|
|
"-device megasas-gen2 -device scsi-cd,drive=cd1 "
|
|
"-blockdev file,node-name=cd1,filename=", test_cdboot);
|
|
+#endif
|
|
}
|
|
|
|
static void add_s390x_tests(void)
|
|
diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
|
|
index a1c689414b..a8f076711c 100644
|
|
--- a/tests/qtest/cpu-plug-test.c
|
|
+++ b/tests/qtest/cpu-plug-test.c
|
|
@@ -110,8 +110,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/qtest/e1000-test.c b/tests/qtest/e1000-test.c
|
|
index ea286d1793..a1847ac8ed 100644
|
|
--- a/tests/qtest/e1000-test.c
|
|
+++ b/tests/qtest/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/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
|
|
index f7b7cfbc2d..99cccf8638 100644
|
|
--- a/tests/qtest/hd-geo-test.c
|
|
+++ b/tests/qtest/hd-geo-test.c
|
|
@@ -737,6 +737,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();
|
|
@@ -781,6 +782,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)
|
|
{
|
|
@@ -960,9 +962,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/qtest/meson.build b/tests/qtest/meson.build
|
|
index c19f1c8503..15ed460ff0 100644
|
|
--- a/tests/qtest/meson.build
|
|
+++ b/tests/qtest/meson.build
|
|
@@ -51,16 +51,13 @@ qtests_i386 = \
|
|
'ide-test',
|
|
'hd-geo-test',
|
|
'boot-order-test',
|
|
- 'bios-tables-test',
|
|
'rtc-test',
|
|
'i440fx-test',
|
|
- 'fuzz-test',
|
|
'fw_cfg-test',
|
|
'device-plug-test',
|
|
'drive_del-test',
|
|
'tco-test',
|
|
'cpu-plug-test',
|
|
- 'q35-test',
|
|
'vmgenid-test',
|
|
'migration-test',
|
|
'test-x86-cpuid-compat',
|
|
@@ -111,17 +108,15 @@ qtests_moxie = [ 'boot-serial-test' ]
|
|
|
|
qtests_ppc = \
|
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
|
- (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
|
|
- ['boot-order-test', 'prom-env-test', 'boot-serial-test'] \
|
|
+ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : [])
|
|
|
|
qtests_ppc64 = \
|
|
(config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \
|
|
- (slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
|
|
+ (slirp.found() ? ['pxe-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
|
|
- (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
|
|
qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test', 'drive_del-test']
|
|
|
|
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
|
|
@@ -164,7 +159,6 @@ qtests_s390x = \
|
|
(config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) + \
|
|
['boot-serial-test',
|
|
'drive_del-test',
|
|
- 'device-plug-test',
|
|
'virtio-ccw-test',
|
|
'cpu-plug-test',
|
|
'migration-test']
|
|
diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
|
|
index f41d80154a..f8dc478ce8 100644
|
|
--- a/tests/qtest/prom-env-test.c
|
|
+++ b/tests/qtest/prom-env-test.c
|
|
@@ -89,10 +89,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/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
|
|
index 7ca1883a29..983aa0719a 100644
|
|
--- a/tests/qtest/test-x86-cpuid-compat.c
|
|
+++ b/tests/qtest/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,+svm,+npt",
|
|
"xlevel", 0x80000008);
|
|
+#endif
|
|
|
|
/* Test feature parsing */
|
|
add_feature_test("x86/cpuid/features/plus",
|
|
diff --git a/tests/qtest/usb-hcd-xhci-test.c b/tests/qtest/usb-hcd-xhci-test.c
|
|
index 10ef9d2a91..3855873050 100644
|
|
--- a/tests/qtest/usb-hcd-xhci-test.c
|
|
+++ b/tests/qtest/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.18.4
|
|
|