提交 c64152b6 编写于 作者: A Andrea Bolognani

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: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NCole Robinson <crobinso@redhat.com>
上级 45dff4bb
......@@ -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;
......
......@@ -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) \
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册