From 7339f4d79bc6c91eee4828049ac13522f633796d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 15 Apr 2019 18:46:44 -0400 Subject: [PATCH] tests: qemuxml2xml: Convert virtio-*transitional to TEST_CAPS Convert these test cases to use DO_TEST_CAPS_LATEST * virtio-transitional * virtio-non-transitional Reviewed-by: Andrea Bolognani Signed-off-by: Cole Robinson --- ...virtio-non-transitional.x86_64-latest.xml} | 0 ... => virtio-transitional.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 20 ++----------------- 3 files changed, 2 insertions(+), 18 deletions(-) rename tests/qemuxml2xmloutdata/{virtio-non-transitional.xml => virtio-non-transitional.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{virtio-transitional.xml => virtio-transitional.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/virtio-non-transitional.xml rename to tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.xml b/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/virtio-transitional.xml rename to tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index aac050f559..20aaa1b9f5 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1319,24 +1319,8 @@ mymain(void) DO_TEST("riscv64-virt-pci", QEMU_CAPS_OBJECT_GPEX); - DO_TEST("virtio-transitional", - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("virtio-non-transitional", - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("virtio-transitional"); + DO_TEST_CAPS_LATEST("virtio-non-transitional"); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- GitLab