They are shorter and most of the code requires the strings anyway. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/domaincapstest.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 6ae3f35..f506739 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -103,7 +103,7 @@ fillAllCaps(virDomainCapsPtr domCaps) static int fillQemuCaps(virDomainCapsPtr domCaps, const char *name, - virArch arch, + const char *arch, const char *machine, virQEMUDriverConfigPtr cfg) { @@ -113,7 +113,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, virDomainCapsLoaderPtr loader = &domCaps->os.loader; if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.xml", - abs_srcdir, name, virArchToString(arch)) < 0 || + abs_srcdir, name, arch) < 0 || !(qemuCaps = qemuTestParseCapabilities(path))) goto cleanup; @@ -171,7 +171,7 @@ struct testData { const char *name; const char *emulator; const char *machine; - virArch arch; + const char *arch; virDomainVirtType type; enum testCapsType capsType; const char *capsName; @@ -191,7 +191,8 @@ test_virDomainCapsFormat(const void *opaque) abs_srcdir, data->name) < 0) goto cleanup; - if (!(domCaps = virDomainCapsNew(data->emulator, data->machine, data->arch, + if (!(domCaps = virDomainCapsNew(data->emulator, data->machine, + virArchFromString(data->arch), data->type))) goto cleanup; @@ -270,35 +271,35 @@ mymain(void) } while (0) DO_TEST("basic", "/bin/emulatorbin", "my-machine-type", - VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_UML, CAPS_NONE); + "x86_64", VIR_DOMAIN_VIRT_UML, CAPS_NONE); DO_TEST("full", "/bin/emulatorbin", "my-machine-type", - VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM, CAPS_ALL); + "x86_64", VIR_DOMAIN_VIRT_KVM, CAPS_ALL); #if WITH_QEMU DO_TEST_QEMU("qemu_1.6.50-1", "caps_1.6.50-1", "/usr/bin/qemu-system-x86_64", NULL, - VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM); + "x86_64", VIR_DOMAIN_VIRT_KVM); DO_TEST_QEMU("qemu_2.6.0-1", "caps_2.6.0-1", "/usr/bin/qemu-system-x86_64", NULL, - VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM); + "x86_64", VIR_DOMAIN_VIRT_KVM); DO_TEST_QEMU("qemu_2.6.0-2", "caps_2.6.0-1", "/usr/bin/qemu-system-aarch64", NULL, - VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM); + "aarch64", VIR_DOMAIN_VIRT_KVM); DO_TEST_QEMU("qemu_2.6.0-3", "caps_2.6.0-1", "/usr/bin/qemu-system-aarch64", "virt", - VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM); + "aarch64", VIR_DOMAIN_VIRT_KVM); DO_TEST_QEMU("qemu_2.6.0-4", "caps_2.6.0-2", "/usr/bin/qemu-system-aarch64", "virt", - VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM); + "aarch64", VIR_DOMAIN_VIRT_KVM); DO_TEST_QEMU("qemu_2.6.0-5", "caps_2.6.0-1", "/usr/bin/qemu-system-ppc64", NULL, - VIR_ARCH_PPC64LE, VIR_DOMAIN_VIRT_KVM); + "ppc64le", VIR_DOMAIN_VIRT_KVM); #endif /* WITH_QEMU */ -- 2.8.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/domaincapstest.c | 12 +++++----- ...-1.x86_64.replies => caps_1.2.2.x86_64.replies} | 0 ...ps_1.2.2-1.x86_64.xml => caps_1.2.2.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.3.1.x86_64.replies} | 0 ...ps_1.3.1-1.x86_64.xml => caps_1.3.1.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.4.2.x86_64.replies} | 0 ...ps_1.4.2-1.x86_64.xml => caps_1.4.2.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.5.3.x86_64.replies} | 0 ...ps_1.5.3-1.x86_64.xml => caps_1.5.3.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.6.0.x86_64.replies} | 0 ...ps_1.6.0-1.x86_64.xml => caps_1.6.0.x86_64.xml} | 0 ...1.x86_64.replies => caps_1.6.50.x86_64.replies} | 0 ..._1.6.50-1.x86_64.xml => caps_1.6.50.x86_64.xml} | 0 ...-1.x86_64.replies => caps_2.1.1.x86_64.replies} | 0 ...ps_2.1.1-1.x86_64.xml => caps_2.1.1.x86_64.xml} | 0 ...-1.x86_64.replies => caps_2.4.0.x86_64.replies} | 0 ...ps_2.4.0-1.x86_64.xml => caps_2.4.0.x86_64.xml} | 0 ...-1.x86_64.replies => caps_2.5.0.x86_64.replies} | 0 ...ps_2.5.0-1.x86_64.xml => caps_2.5.0.x86_64.xml} | 0 ...64.replies => caps_2.6.0-gicv2.aarch64.replies} | 0 ...-1.aarch64.xml => caps_2.6.0-gicv2.aarch64.xml} | 0 ...64.replies => caps_2.6.0-gicv3.aarch64.replies} | 0 ...-2.aarch64.xml => caps_2.6.0-gicv3.aarch64.xml} | 0 ....ppc64le.replies => caps_2.6.0.ppc64le.replies} | 0 ..._2.6.0-1.ppc64le.xml => caps_2.6.0.ppc64le.xml} | 0 ...-1.x86_64.replies => caps_2.6.0.x86_64.replies} | 0 ...ps_2.6.0-1.x86_64.xml => caps_2.6.0.x86_64.xml} | 0 tests/qemucapabilitiestest.c | 26 +++++++++++----------- 28 files changed, 19 insertions(+), 19 deletions(-) rename tests/qemucapabilitiesdata/{caps_1.2.2-1.x86_64.replies => caps_1.2.2.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.2.2-1.x86_64.xml => caps_1.2.2.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.3.1-1.x86_64.replies => caps_1.3.1.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.3.1-1.x86_64.xml => caps_1.3.1.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.4.2-1.x86_64.replies => caps_1.4.2.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.4.2-1.x86_64.xml => caps_1.4.2.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.5.3-1.x86_64.replies => caps_1.5.3.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.5.3-1.x86_64.xml => caps_1.5.3.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.0-1.x86_64.replies => caps_1.6.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.0-1.x86_64.xml => caps_1.6.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.50-1.x86_64.replies => caps_1.6.50.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.50-1.x86_64.xml => caps_1.6.50.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.1.1-1.x86_64.replies => caps_2.1.1.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.1.1-1.x86_64.xml => caps_2.1.1.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.4.0-1.x86_64.replies => caps_2.4.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.4.0-1.x86_64.xml => caps_2.4.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.5.0-1.x86_64.replies => caps_2.5.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.5.0-1.x86_64.xml => caps_2.5.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.aarch64.replies => caps_2.6.0-gicv2.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.aarch64.xml => caps_2.6.0-gicv2.aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-2.aarch64.replies => caps_2.6.0-gicv3.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-2.aarch64.xml => caps_2.6.0-gicv3.aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.ppc64le.replies => caps_2.6.0.ppc64le.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.ppc64le.xml => caps_2.6.0.ppc64le.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.x86_64.replies => caps_2.6.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.x86_64.xml => caps_2.6.0.x86_64.xml} (100%) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index ecebc82..3436197 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -286,27 +286,27 @@ mymain(void) #if WITH_QEMU - DO_TEST_QEMU("1.6.50", "caps_1.6.50-1", + DO_TEST_QEMU("1.6.50", "caps_1.6.50", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0-1", + DO_TEST_QEMU("2.6.0", "caps_2.6.0", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0-1", + 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-1", + 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-2", + 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-1", + DO_TEST_QEMU("2.6.0", "caps_2.6.0", "/usr/bin/qemu-system-ppc64", NULL, "ppc64le", VIR_DOMAIN_VIRT_KVM); diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.replies rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.replies rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml rename to tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.replies rename to tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml rename to tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.replies rename to tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml rename to tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 9a5a250..058ad8c 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -160,19 +160,19 @@ mymain(void) ret = -1; \ } while (0) - DO_TEST("x86_64", "caps_1.2.2-1"); - DO_TEST("x86_64", "caps_1.3.1-1"); - DO_TEST("x86_64", "caps_1.4.2-1"); - DO_TEST("x86_64", "caps_1.5.3-1"); - DO_TEST("x86_64", "caps_1.6.0-1"); - DO_TEST("x86_64", "caps_1.6.50-1"); - DO_TEST("x86_64", "caps_2.1.1-1"); - DO_TEST("x86_64", "caps_2.4.0-1"); - DO_TEST("x86_64", "caps_2.5.0-1"); - DO_TEST("x86_64", "caps_2.6.0-1"); - DO_TEST("aarch64", "caps_2.6.0-1"); - DO_TEST("aarch64", "caps_2.6.0-2"); - DO_TEST("ppc64le", "caps_2.6.0-1"); + DO_TEST("x86_64", "caps_1.2.2"); + DO_TEST("x86_64", "caps_1.3.1"); + DO_TEST("x86_64", "caps_1.4.2"); + DO_TEST("x86_64", "caps_1.5.3"); + DO_TEST("x86_64", "caps_1.6.0"); + DO_TEST("x86_64", "caps_1.6.50"); + DO_TEST("x86_64", "caps_2.1.1"); + DO_TEST("x86_64", "caps_2.4.0"); + DO_TEST("x86_64", "caps_2.5.0"); + DO_TEST("x86_64", "caps_2.6.0"); + DO_TEST("aarch64", "caps_2.6.0-gicv2"); + DO_TEST("aarch64", "caps_2.6.0-gicv3"); + DO_TEST("ppc64le", "caps_2.6.0"); /* * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies" -- 2.8.2