diff mbox series

[v2,1/4] tests: qemuxml2argv: Tweak TEST_CAPS_PATH

Message ID b005a120bb09770aea8bec827363864defa77a52.1553197802.git.crobinso@redhat.com
State Accepted
Commit 710990ec4173e7ab68625d83b495e6324e613fb7
Headers show
Series tests: qemuxml2argv: support optional arguments | expand

Commit Message

Cole Robinson March 21, 2019, 7:55 p.m. UTC 
Make it an actual path and not a string prefix

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 tests/qemuxml2argvtest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Andrea Bolognani March 22, 2019, 9:06 a.m. UTC | #1 
On Thu, 2019-03-21 at 15:55 -0400, Cole Robinson wrote:
> Make it an actual path and not a string prefix

> 

> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> ---

>  tests/qemuxml2argvtest.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)


Reviewed-by: Andrea Bolognani <abologna@redhat.com>


-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox series

Patch

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); \