From: Jiri Denemark Date: Tue, 10 May 2016 18:29:17 +0000 (+0200) Subject: domaincapstest: Give better names to test data files X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9ac9b039c49d04afc14015ee7385b1cece1ac85a;p=libvirt.git domaincapstest: Give better names to test data files Signed-off-by: Jiri Denemark --- diff --git a/tests/domaincapsschemadata/basic.xml b/tests/domaincapsschemadata/basic.xml new file mode 100644 index 0000000000..5513f99357 --- /dev/null +++ b/tests/domaincapsschemadata/basic.xml @@ -0,0 +1,16 @@ + + /bin/emulatorbin + uml + my-machine-type + x86_64 + + + + + + + + + diff --git a/tests/domaincapsschemadata/domaincaps-basic.xml b/tests/domaincapsschemadata/domaincaps-basic.xml deleted file mode 100644 index 5513f99357..0000000000 --- a/tests/domaincapsschemadata/domaincaps-basic.xml +++ /dev/null @@ -1,16 +0,0 @@ - - /bin/emulatorbin - uml - my-machine-type - x86_64 - - - - - - - - - diff --git a/tests/domaincapsschemadata/domaincaps-full.xml b/tests/domaincapsschemadata/domaincaps-full.xml deleted file mode 100644 index 2f529ff40c..0000000000 --- a/tests/domaincapsschemadata/domaincaps-full.xml +++ /dev/null @@ -1,95 +0,0 @@ - - /bin/emulatorbin - kvm - my-machine-type - x86_64 - - - - /foo/bar - /tmp/my_path - - rom - pflash - - - default - yes - no - - - - - - - disk - cdrom - floppy - lun - - - ide - fdc - scsi - virtio - xen - usb - uml - sata - sd - - - - - sdl - vnc - rdp - desktop - spice - - - - - - subsystem - capabilities - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - storage - misc - net - - - default - kvm - vfio - xen - - - - - - - diff --git a/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml b/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml deleted file mode 100644 index 161d0ab821..0000000000 --- a/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml +++ /dev/null @@ -1,78 +0,0 @@ - - /usr/bin/qemu-system-x86_64 - kvm - pc-i440fx-1.7 - x86_64 - - - - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd - - rom - pflash - - - yes - no - - - - - - - disk - cdrom - floppy - lun - - - ide - fdc - scsi - virtio - usb - - - - - sdl - vnc - spice - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - - default - kvm - vfio - - - - - - - diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml deleted file mode 100644 index f42d239584..0000000000 --- a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml +++ /dev/null @@ -1,79 +0,0 @@ - - /usr/bin/qemu-system-x86_64 - kvm - pc-i440fx-2.4 - x86_64 - - - - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd - - rom - pflash - - - yes - no - - - - - - - disk - cdrom - floppy - lun - - - ide - fdc - scsi - virtio - usb - - - - - sdl - vnc - spice - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - - default - kvm - vfio - - - - - - - diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml deleted file mode 100644 index 4e87cd281b..0000000000 --- a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml +++ /dev/null @@ -1,76 +0,0 @@ - - /usr/bin/qemu-system-aarch64 - kvm - integratorcp - aarch64 - - - - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd - - rom - pflash - - - yes - no - - - - - - - disk - cdrom - floppy - lun - - - ide - fdc - scsi - virtio - usb - - - - - sdl - vnc - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - - default - kvm - vfio - - - - - - - diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml deleted file mode 100644 index f5f0f1cd07..0000000000 --- a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml +++ /dev/null @@ -1,80 +0,0 @@ - - /usr/bin/qemu-system-aarch64 - kvm - virt-2.6 - aarch64 - - - - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd - - rom - pflash - - - yes - no - - - - - - - disk - cdrom - floppy - lun - - - ide - fdc - scsi - virtio - usb - - - - - sdl - vnc - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - - default - kvm - vfio - - - - - - - 2 - - - - diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml deleted file mode 100644 index 1ae8172db2..0000000000 --- a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml +++ /dev/null @@ -1,80 +0,0 @@ - - /usr/bin/qemu-system-aarch64 - kvm - virt-2.6 - aarch64 - - - - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd - - rom - pflash - - - yes - no - - - - - - - disk - cdrom - floppy - lun - - - ide - fdc - scsi - virtio - usb - - - - - sdl - vnc - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - - default - kvm - vfio - - - - - - - 3 - - - - diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml deleted file mode 100644 index 583fdf0024..0000000000 --- a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml +++ /dev/null @@ -1,74 +0,0 @@ - - /usr/bin/qemu-system-ppc64 - kvm - pseries-2.6 - ppc64le - - - - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd - - rom - pflash - - - yes - no - - - - - - - disk - cdrom - lun - - - ide - scsi - virtio - usb - - - - - sdl - vnc - - - - - - subsystem - - - default - mandatory - requisite - optional - - - usb - pci - scsi - - - - default - kvm - vfio - - - - - - - diff --git a/tests/domaincapsschemadata/full.xml b/tests/domaincapsschemadata/full.xml new file mode 100644 index 0000000000..2f529ff40c --- /dev/null +++ b/tests/domaincapsschemadata/full.xml @@ -0,0 +1,95 @@ + + /bin/emulatorbin + kvm + my-machine-type + x86_64 + + + + /foo/bar + /tmp/my_path + + rom + pflash + + + default + yes + no + + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + xen + usb + uml + sata + sd + + + + + sdl + vnc + rdp + desktop + spice + + + + + + subsystem + capabilities + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + storage + misc + net + + + default + kvm + vfio + xen + + + + + + + diff --git a/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml b/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml new file mode 100644 index 0000000000..161d0ab821 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml @@ -0,0 +1,78 @@ + + /usr/bin/qemu-system-x86_64 + kvm + pc-i440fx-1.7 + x86_64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + + + + + sdl + vnc + spice + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml new file mode 100644 index 0000000000..f5f0f1cd07 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml @@ -0,0 +1,80 @@ + + /usr/bin/qemu-system-aarch64 + kvm + virt-2.6 + aarch64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + 2 + + + + diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml new file mode 100644 index 0000000000..1ae8172db2 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml @@ -0,0 +1,80 @@ + + /usr/bin/qemu-system-aarch64 + kvm + virt-2.6 + aarch64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + 3 + + + + diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml new file mode 100644 index 0000000000..4e87cd281b --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml @@ -0,0 +1,76 @@ + + /usr/bin/qemu-system-aarch64 + kvm + integratorcp + aarch64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml new file mode 100644 index 0000000000..583fdf0024 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml @@ -0,0 +1,74 @@ + + /usr/bin/qemu-system-ppc64 + kvm + pseries-2.6 + ppc64le + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + disk + cdrom + lun + + + ide + scsi + virtio + usb + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml new file mode 100644 index 0000000000..f42d239584 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml @@ -0,0 +1,79 @@ + + /usr/bin/qemu-system-x86_64 + kvm + pc-i440fx-2.4 + x86_64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + + + + + sdl + vnc + spice + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index f506739fa8..ecebc82187 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -187,7 +187,7 @@ test_virDomainCapsFormat(const void *opaque) char *domCapsXML = NULL; int ret = -1; - if (virAsprintf(&path, "%s/domaincapsschemadata/domaincaps-%s.xml", + if (virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", abs_srcdir, data->name) < 0) goto cleanup; @@ -256,8 +256,16 @@ mymain(void) #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ do { \ + char *name = NULL; \ + if (virAsprintf(&name, "qemu_%s%s%s.%s", \ + Name, \ + Machine ? "-" : "", Machine ? Machine : "", \ + Arch) < 0) { \ + ret = -1; \ + break; \ + } \ struct testData data = { \ - .name = Name, \ + .name = name, \ .emulator = Emulator, \ .machine = Machine, \ .arch = Arch, \ @@ -266,8 +274,9 @@ mymain(void) .capsName = CapsName, \ .capsOpaque = cfg, \ }; \ - if (virtTestRun(Name, test_virDomainCapsFormat, &data) < 0) \ + if (virtTestRun(name, test_virDomainCapsFormat, &data) < 0) \ ret = -1; \ + VIR_FREE(name); \ } while (0) DO_TEST("basic", "/bin/emulatorbin", "my-machine-type", @@ -277,27 +286,27 @@ mymain(void) #if WITH_QEMU - DO_TEST_QEMU("qemu_1.6.50-1", "caps_1.6.50-1", + DO_TEST_QEMU("1.6.50", "caps_1.6.50-1", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("qemu_2.6.0-1", "caps_2.6.0-1", + DO_TEST_QEMU("2.6.0", "caps_2.6.0-1", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("qemu_2.6.0-2", "caps_2.6.0-1", + DO_TEST_QEMU("2.6.0", "caps_2.6.0-1", "/usr/bin/qemu-system-aarch64", NULL, "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("qemu_2.6.0-3", "caps_2.6.0-1", + DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-1", "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("qemu_2.6.0-4", "caps_2.6.0-2", + DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-2", "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("qemu_2.6.0-5", "caps_2.6.0-1", + DO_TEST_QEMU("2.6.0", "caps_2.6.0-1", "/usr/bin/qemu-system-ppc64", NULL, "ppc64le", VIR_DOMAIN_VIRT_KVM);