External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use TEST_QEMU_CAPS_PATH wherever possible

Browse Source 
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>
This commit is contained in:
Andrea Bolognani 2019-04-16 12:31:00 +02:00
parent 45dff4bbfa
commit c64152b67c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/domaincapstest.c
View File

@ -88,8 +88,8 @@ fillQemuCaps(virDomainCapsPtr domCaps,
fakeHostCPU(caps, domCaps->arch) < 0) fakeHostCPU(caps, domCaps->arch) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.xml", if (virAsprintf(&path, "%s/%s.%s.xml",
abs_srcdir, name, arch) < 0 || TEST_QEMU_CAPS_PATH, name, arch) < 0 ||
!(qemuCaps = qemuTestParseCapabilities(caps, path))) !(qemuCaps = qemuTestParseCapabilities(caps, path)))
goto cleanup; goto cleanup;

2
tests/qemuargv2xmltest.c
View File

@ -156,7 +156,7 @@ mymain(void)
do { \ do { \
virQEMUCapsPtr qemuCaps; \ virQEMUCapsPtr qemuCaps; \
qemuCaps = qemuTestParseCapabilitiesArch(VIR_ARCH_X86_64, \ 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, \ if (virFileCacheInsertData(driver.qemuCapsCache, \
"/usr/bin/qemu-system-" arch, \ "/usr/bin/qemu-system-" arch, \
qemuCaps) < 0) \ qemuCaps) < 0) \

2
tests/qemucapabilitiestest.c
View File

@ -48,7 +48,7 @@ testQemuDataInit(testQemuDataPtr data)
if (qemuTestDriverInit(&data->driver) < 0) if (qemuTestDriverInit(&data->driver) < 0)
return -1; return -1;
data->dataDir = abs_srcdir "/qemucapabilitiesdata"; data->dataDir = TEST_QEMU_CAPS_PATH;
data->ret = 0; data->ret = 0;

2
tests/qemucaps2xmltest.c
View File

@ -39,7 +39,7 @@ struct _testQemuData {
static int static int
testQemuDataInit(testQemuDataPtr data) testQemuDataInit(testQemuDataPtr data)
{ {
data->inputDir = abs_srcdir "/qemucapabilitiesdata"; data->inputDir = TEST_QEMU_CAPS_PATH;
data->outputDir = abs_srcdir "/qemucaps2xmloutdata"; data->outputDir = abs_srcdir "/qemucaps2xmloutdata";
data->ret = 0; data->ret = 0;