[libvirt] [PATCH 4/4] 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(a)redhat.com>
---
tests/domaincapstest.c | 4 ++--
tests/qemuargv2xmltest.c | 2 +-
tests/qemucapabilitiestest.c | 2 +-
tests/qemucaps2xmltest.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index a9922e1edb..f87a1d63fb 100644
--- 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 29c80a0471..2a51e22318 100644
--- 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 5477740339..ac9ab6bfce 100644
--- 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 59f676ede1..d107b32221 100644
--- 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;
--
2.20.1