[libvirt] [PATCH 1/3] tests: domaincaps: Order by architecture

Andrea Bolognani abologna at redhat.com
Fri Mar 23 14:05:39 UTC 2018


Test cases in qemucapabilitiestest are ordered by architecture
first, then by QEMU version. Use the same order here.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 tests/domaincapstest.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 533a4b3791..12a7167b30 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -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);
-- 
2.14.3




More information about the libvir-list mailing list