tests/domaincaps: Don't mess with test name

Requiring the user to provide the final string themselves will
make subsequent changes easier to implement.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 7a69543a45524ca7f5d8e5b471024255e1552035..f38f5fb0477a7d9dbba1bd1669fdc4a64675a270 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -299,9 +299,8 @@ mymain(void)
 #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \
     do { \
         char *name = NULL; \
-        if (virAsprintf(&name, "qemu_%s%s%s.%s", \
+        if (virAsprintf(&name, "qemu_%s.%s", \
                         Name, \
-                        Machine ? "-" : "", Machine ? Machine : "", \
                         Arch) < 0) { \
             ret = -1; \
             break; \
@@ -387,7 +386,7 @@ mymain(void)
                  "/usr/bin/qemu-system-x86_64", NULL,
                  "x86_64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.9.0", "caps_2.9.0",
+    DO_TEST_QEMU("2.9.0-q35", "caps_2.9.0",
                  "/usr/bin/qemu-system-x86_64", "q35",
                  "x86_64", VIR_DOMAIN_VIRT_KVM);
 
@@ -403,11 +402,11 @@ mymain(void)
                  "/usr/bin/qemu-system-aarch64", NULL,
                  "aarch64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.6.0", "caps_2.6.0",
+    DO_TEST_QEMU("2.6.0-virt", "caps_2.6.0",
                  "/usr/bin/qemu-system-aarch64", "virt",
                  "aarch64", VIR_DOMAIN_VIRT_KVM);
 
-    DO_TEST_QEMU("2.12.0", "caps_2.12.0",
+    DO_TEST_QEMU("2.12.0-virt", "caps_2.12.0",
                  "/usr/bin/qemu-system-aarch64", "virt",
                  "aarch64", VIR_DOMAIN_VIRT_KVM);