From edf2239bb556d592fa13988bba01d0f5939b01b9 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Fri, 23 Mar 2018 13:38:32 +0100 Subject: [PATCH] tests: domaincaps: Order by architecture Test cases in qemucapabilitiestest are ordered by architecture first, then by QEMU version. Use the same order here. Signed-off-by: Andrea Bolognani --- 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); -- GitLab