From ba491ddab7d906b0b07006b6cd6bcc1b7ff4747c Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 21 Sep 2021 16:35:51 +0200 Subject: [PATCH] qemuxml2argvtest: Agregate all 'disk'-related test cases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There were a few disk-related test cases spread around in the test invocation calls. Move them together with disk tests and move one irrelevant case away from the disk test block. Note that there are still a few tests having 'disk' in the name but they belong to different groups mostly. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/qemuxml2argvtest.c | 50 +++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cca0542b32..d0a73aee1c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1290,6 +1290,9 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); + + DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("disk-cdrom"); DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); @@ -1317,7 +1320,6 @@ mymain(void) DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW); DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW); DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); - DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_NOCAPS("disk-boot-disk"); @@ -1468,6 +1470,29 @@ mymain(void) DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64"); + DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS); + DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS); + DO_TEST_NOCAPS("luks-disks"); + DO_TEST_NOCAPS("luks-disks-source"); + DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2"); + DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS); + DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0"); + DO_TEST_CAPS_LATEST("luks-disks-source-qcow2"); + DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid"); + DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both"); + + DO_TEST_NOCAPS("disk-ide-split"); + DO_TEST("disk-ide-wwn", + QEMU_CAPS_IDE_DRIVE_WWN, + QEMU_CAPS_SCSI_DISK_WWN); + + DO_TEST_NOCAPS("disk-geometry"); + DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO); + + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); + DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); + DO_TEST("graphics-egl-headless", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_EGL_HEADLESS); @@ -2104,17 +2129,6 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-translation"); qemuTestSetHostCPU(&driver, driver.hostarch, NULL); - DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS); - DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS); - DO_TEST_NOCAPS("luks-disks"); - DO_TEST_NOCAPS("luks-disks-source"); - DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2"); - DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS); - DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0"); - DO_TEST_CAPS_LATEST("luks-disks-source-qcow2"); - DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both"); - DO_TEST_NOCAPS("memtune"); DO_TEST_NOCAPS("memtune-unlimited"); DO_TEST_NOCAPS("blkiotune"); @@ -2433,14 +2447,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST_PARSE_ERROR_NOCAPS("mach-virt-serial-invalid-machine"); - DO_TEST_NOCAPS("disk-ide-split"); - DO_TEST("disk-ide-wwn", - QEMU_CAPS_IDE_DRIVE_WWN, - QEMU_CAPS_SCSI_DISK_WWN); - - DO_TEST_NOCAPS("disk-geometry"); - DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO); - DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, QEMU_CAPS_VNC, @@ -3410,10 +3416,6 @@ mymain(void) QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); - DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); - DO_TEST_CAPS_LATEST("tseg-explicit-size"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size");