From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 21 Mar 2019 19:03:32 +0000 (-0400)
Subject: tests: qemuxml2argv: Tweak TEST_CAPS_PATH
X-Git-Tag: v5.2.0-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=710990ec4173e7ab68625d83b495e6324e613fb7;p=thirdparty%2Flibvirt.git

tests: qemuxml2argv: Tweak TEST_CAPS_PATH

Make it an actual path and not a string prefix

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 02bf288a4b..8e89be65de 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -819,7 +819,7 @@ mymain(void)
  * the test cases should be forked using DO_TEST_CAPS_VER with the appropriate
  * version.
  */
-# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_"
+# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata"
 
 # define DO_TEST_CAPS_INTERNAL(_name, arch, ver, ...) \
     do { \
@@ -827,7 +827,7 @@ mymain(void)
             .name = _name, \
             .suffix = "." arch "-" ver, \
         }; \
-        static const char *capsfile = TEST_CAPS_PATH ver "." arch ".xml"; \
+        static const char *capsfile = TEST_CAPS_PATH "/caps_" ver "." arch ".xml"; \
         static bool stripmachinealiases; \
         if (STREQ(ver, "latest")) { \
             capsfile = virHashLookup(capslatest, arch); \