tests: Use TEST_QEMU_CAPS_PATH wherever possible

After the recent changes, there are only a few places left
where we use the explicit path instead of taking advantage of
the publicly available define; let's get rid of those too.

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

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index a9922e1edb88854a6a195cd3358e4e06f36eefb5..f87a1d63fbf6b877c964d2f2f286da42976a5c17 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -88,8 +88,8 @@ fillQemuCaps(virDomainCapsPtr domCaps,
         fakeHostCPU(caps, domCaps->arch) < 0)
         goto cleanup;
 
-    if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.xml",
-                    abs_srcdir, name, arch) < 0 ||
+    if (virAsprintf(&path, "%s/%s.%s.xml",
+                    TEST_QEMU_CAPS_PATH, name, arch) < 0 ||
         !(qemuCaps = qemuTestParseCapabilities(caps, path)))
         goto cleanup;
 

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 29c80a0471d8669d06a41e5468a220b95def1b39..2a51e22318ec061ea7b9a9849d072422b94665a3 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -156,7 +156,7 @@ mymain(void)
     do { \
         virQEMUCapsPtr qemuCaps; \
         qemuCaps = qemuTestParseCapabilitiesArch(VIR_ARCH_X86_64, \
-                                                 abs_srcdir "/qemucapabilitiesdata/caps_2.12.0." arch ".xml"); \
+                                                 TEST_QEMU_CAPS_PATH "/caps_2.12.0." arch ".xml"); \
         if (virFileCacheInsertData(driver.qemuCapsCache, \
                                    "/usr/bin/qemu-system-" arch, \
                                    qemuCaps) < 0) \

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 5477740339d60ef949b2285db1a43ce4f852e0ed..ac9ab6bfce65ff67e11a41d78bb58e7defc0b828 100644 (file)
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -48,7 +48,7 @@ testQemuDataInit(testQemuDataPtr data)
     if (qemuTestDriverInit(&data->driver) < 0)
         return -1;
 
-    data->dataDir = abs_srcdir "/qemucapabilitiesdata";
+    data->dataDir = TEST_QEMU_CAPS_PATH;
 
     data->ret = 0;
 

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 59f676ede14464bfd7c2bdfc86f8725de601fe89..d107b322215908858b2742426bc6930718317e3c 100644 (file)
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -39,7 +39,7 @@ struct _testQemuData {
 static int
 testQemuDataInit(testQemuDataPtr data)
 {
-    data->inputDir = abs_srcdir "/qemucapabilitiesdata";
+    data->inputDir = TEST_QEMU_CAPS_PATH;
     data->outputDir = abs_srcdir "/qemucaps2xmloutdata";
 
     data->ret = 0;