External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvtest: Consolidate tests for usb controllers

Browse Source 
Move all controller related tests together and consolidate naming of the
test cases.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-08-31 14:45:13 +02:00
parent a771b13e75
commit 2b8ccecbc3
14 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/qemuxml2argvdata/usb-ich9-autoassign.args → tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args
View File

0
tests/qemuxml2argvdata/usb-ich9-autoassign.xml → tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml
View File

0
tests/qemuxml2argvdata/usb-ich9-companion.args → tests/qemuxml2argvdata/usb-controller-ich9-companion.args
View File

0
tests/qemuxml2argvdata/usb-ich9-companion.xml → tests/qemuxml2argvdata/usb-controller-ich9-companion.xml
View File

0
tests/qemuxml2argvdata/usb-ich9-ehci-addr.args → tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args
View File

0
tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml → tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml
View File

0
tests/qemuxml2argvdata/usb-ich9-no-companion.err → tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err
View File

0
tests/qemuxml2argvdata/usb-ich9-no-companion.xml → tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml
View File

0
tests/qemuxml2argvdata/usb-piix3-controller.args → tests/qemuxml2argvdata/usb-controller-piix3.args
View File

0
tests/qemuxml2argvdata/usb-piix3-controller.xml → tests/qemuxml2argvdata/usb-controller-piix3.xml
View File

89
tests/qemuxml2argvtest.c
View File

@ -1500,19 +1500,59 @@ mymain(void)
DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path",
QEMU_CAPS_CHARDEV_RECONNECT);
DO_TEST_NOCAPS("usb-none");
DO_TEST_NOCAPS("usb-controller");
DO_TEST("usb-piix3-controller",
DO_TEST("usb-controller-piix3",
QEMU_CAPS_PIIX3_USB_UHCI);
DO_TEST("usb-ich9-ehci-addr",
DO_TEST("usb-controller-ich9-ehci-addr",
QEMU_CAPS_ICH9_USB_EHCI1);
DO_TEST_NOCAPS("input-usbmouse-addr");
DO_TEST("usb-ich9-companion",
DO_TEST("usb-controller-ich9-companion",
QEMU_CAPS_ICH9_USB_EHCI1);
DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion",
QEMU_CAPS_ICH9_USB_EHCI1);
DO_TEST("usb-ich9-autoassign",
DO_TEST("usb-controller-ich9-autoassign",
QEMU_CAPS_ICH9_USB_EHCI1,
QEMU_CAPS_USB_HUB);
DO_TEST("usb1-usb2",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_USB_HUB,
QEMU_CAPS_ICH9_USB_EHCI1);
DO_TEST("usb-controller-default-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST_FAILURE("usb-controller-default-unavailable-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-controller-explicit-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI);
DO_TEST("usb-controller-xhci",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-xhci-autoassign",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_USB_HUB);
DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI);
DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable");
DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
QEMU_CAPS_DEVICE_QEMU_XHCI);
DO_TEST_NOCAPS("input-usbmouse-addr");
DO_TEST("usb-hub",
QEMU_CAPS_USB_HUB);
DO_TEST("usb-hub-autoadd",
@ -1558,47 +1598,10 @@ mymain(void)
QEMU_CAPS_USB_REDIR_FILTER,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST_CAPS_LATEST("usb-redir-unix");
DO_TEST("usb1-usb2",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_USB_HUB,
QEMU_CAPS_ICH9_USB_EHCI1);
DO_TEST_NOCAPS("usb-none");
DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other");
DO_TEST_PARSE_ERROR("usb-none-hub",
QEMU_CAPS_USB_HUB);
DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet");
DO_TEST("usb-controller-default-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST_FAILURE("usb-controller-default-unavailable-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-controller-explicit-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_PCI_OHCI,
QEMU_CAPS_PIIX3_USB_UHCI);
DO_TEST("usb-controller-xhci",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-xhci-autoassign",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_USB_HUB);
DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI);
DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable");
DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
QEMU_CAPS_DEVICE_QEMU_XHCI);
DO_TEST_NOCAPS("smbios");
DO_TEST_PARSE_ERROR_NOCAPS("smbios-date");

0
tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml → tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
View File

0
tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml → tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml
View File

4
tests/qemuxml2xmltest.c
View File

@ -483,7 +483,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("usb-none");
DO_TEST_CAPS_LATEST("usb-controller");
DO_TEST_CAPS_LATEST("usb-piix3-controller");
DO_TEST_CAPS_LATEST("usb-controller-piix3");
DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr");
DO_TEST_CAPS_LATEST("usb-controller-default-q35");
DO_TEST_CAPS_LATEST("usb-controller-explicit-q35");
DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64");
@ -573,7 +574,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr");
DO_TEST_CAPS_LATEST("disk-copy_on_read");
DO_TEST_CAPS_LATEST("tpm-passthrough");
DO_TEST_CAPS_LATEST("tpm-passthrough-crb");