[libvirt] [PATCH v2 1/4] tests: qemuxml2argv: Tweak TEST_CAPS_PATH

Cole Robinson crobinso at redhat.com
Thu Mar 21 19:55:03 UTC 2019


Make it an actual path and not a string prefix

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 tests/qemuxml2argvtest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 14d3df02a9..d982a497a9 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); \
-- 
2.21.0




More information about the libvir-list mailing list