tests: qemuxml2argv: build capsfile in DO_TEST_CAPS_INTERNAL

Rather than make callers do it. The operative info is just arch
and ver which we are passing in already.

Fold in stripmachinealiases too since it is just dependent on
ver value

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 02cb65317ff55d3c6eb401018dd9fac701dc323d..2aad97531515294e73c5a85a37df7a8c108062cd 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -799,13 +799,20 @@ mymain(void)
  * the test cases should be forked using DO_TEST_CAPS_VER with the appropriate
  * version.
  */
-# define DO_TEST_CAPS_INTERNAL(_name, arch, ver, \
-                               capsfile, stripmachinealiases, ...) \
+# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_"
+
+# define DO_TEST_CAPS_INTERNAL(_name, arch, ver, ...) \
     do { \
         static struct testInfo info = { \
             .name = _name, \
             .suffix = "." arch "-" ver, \
         }; \
+        static const char *capsfile = TEST_CAPS_PATH ver "." arch ".xml"; \
+        static bool stripmachinealiases; \
+        if (STREQ(ver, "latest")) { \
+            capsfile = virHashLookup(capslatest, arch); \
+            stripmachinealiases = true; \
+        } \
         if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \
                                                             capsfile))) \
             return EXIT_FAILURE; \
@@ -820,23 +827,15 @@ mymain(void)
         virObjectUnref(info.qemuCaps); \
     } while (0)
 
-# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_"
-
-# define DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ...) \
-    DO_TEST_CAPS_INTERNAL(name, arch, ver, \
-                          TEST_CAPS_PATH ver "." arch ".xml", false, \
-                          __VA_ARGS__)
 
 # define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \
-    DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END)
+    DO_TEST_CAPS_INTERNAL(name, arch, ver, ARG_END)
 
 # define DO_TEST_CAPS_VER(name, ver) \
     DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
 
 # define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \
-    DO_TEST_CAPS_INTERNAL(name, arch, "latest", \
-                          virHashLookup(capslatest, arch), true, \
-                          __VA_ARGS__)
+    DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__)
 
 # define DO_TEST_CAPS_ARCH_LATEST(name, arch) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ARG_END)