]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: domaincaps: Order by architecture
authorAndrea Bolognani <abologna@redhat.com>
Fri, 23 Mar 2018 12:38:32 +0000 (13:38 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Fri, 23 Mar 2018 19:27:51 +0000 (20:27 +0100)
Test cases in qemucapabilitiestest are ordered by architecture
first, then by QEMU version. Use the same order here.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
tests/domaincapstest.c

index 533a4b3791f303c06daa03beecdeb003ade2e3d2..12a7167b304e7dea7e56967f5fba4fc703cddd1d 100644 (file)
@@ -448,22 +448,6 @@ mymain(void)
                  "/usr/bin/qemu-system-x86_64", NULL,
                  "x86_64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2",
-                 "/usr/bin/qemu-system-aarch64", NULL,
-                 "aarch64", VIR_DOMAIN_VIRT_KVM);
-
-    DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2",
-                 "/usr/bin/qemu-system-aarch64", "virt",
-                 "aarch64", VIR_DOMAIN_VIRT_KVM);
-
-    DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3",
-                 "/usr/bin/qemu-system-aarch64", "virt",
-                 "aarch64", VIR_DOMAIN_VIRT_KVM);
-
-    DO_TEST_QEMU("2.6.0", "caps_2.6.0",
-                 "/usr/bin/qemu-system-ppc64", NULL,
-                 "ppc64", VIR_DOMAIN_VIRT_KVM);
-
     DO_TEST_QEMU("2.8.0", "caps_2.8.0",
                  "/usr/bin/qemu-system-x86_64", NULL,
                  "x86_64", VIR_DOMAIN_VIRT_KVM);
@@ -484,6 +468,22 @@ mymain(void)
                  "/usr/bin/qemu-system-x86_64", NULL,
                  "x86_64", VIR_DOMAIN_VIRT_QEMU);
 
+    DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2",
+                 "/usr/bin/qemu-system-aarch64", NULL,
+                 "aarch64", VIR_DOMAIN_VIRT_KVM);
+
+    DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2",
+                 "/usr/bin/qemu-system-aarch64", "virt",
+                 "aarch64", VIR_DOMAIN_VIRT_KVM);
+
+    DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3",
+                 "/usr/bin/qemu-system-aarch64", "virt",
+                 "aarch64", VIR_DOMAIN_VIRT_KVM);
+
+    DO_TEST_QEMU("2.6.0", "caps_2.6.0",
+                 "/usr/bin/qemu-system-ppc64", NULL,
+                 "ppc64", VIR_DOMAIN_VIRT_KVM);
+
     DO_TEST_QEMU("2.7.0", "caps_2.7.0",
                  "/usr/bin/qemu-system-s390x", NULL,
                  "s390x", VIR_DOMAIN_VIRT_KVM);