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: testQemuCapsIterate: Pass inputDir to callback

Browse Source 
Right now users need to know input file live inside
TEST_QEMU_CAPS_PATH, which is bad layering.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-10-22 15:34:10 +02:00
parent 29795544fd
commit 51495a4d73
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemucapabilitiestest.c
View File

@ -49,7 +49,6 @@ testQemuDataInit(testQemuDataPtr data)
if (qemuTestDriverInit(&data->driver) < 0)
return -1;
data->inputDir = TEST_QEMU_CAPS_PATH;
data->outputDir = TEST_QEMU_CAPS_PATH;
data->ret = 0;
@ -180,7 +179,8 @@ testQemuCapsCopy(const void *opaque)
static int
doCapsTest(const char *base,
doCapsTest(const char *inputDir,
const char *base,
const char *archName,
void *opaque)
{
@ -193,6 +193,7 @@ doCapsTest(const char *base,
return -1;
}
data->inputDir = inputDir;
data->base = base;
data->archName = archName;

5
tests/qemucaps2xmltest.c
View File

@ -39,7 +39,6 @@ struct _testQemuData {
static int
testQemuDataInit(testQemuDataPtr data)
{
data->inputDir = TEST_QEMU_CAPS_PATH;
data->outputDir = abs_srcdir "/qemucaps2xmloutdata";
data->ret = 0;
@ -174,7 +173,8 @@ testQemuCapsXML(const void *opaque)
}
static int
doCapsTest(const char *base,
doCapsTest(const char *inputDir,
const char *base,
const char *archName,
void *opaque)
{
@ -184,6 +184,7 @@ doCapsTest(const char *base,
if (virAsprintf(&title, "%s (%s)", base, archName) < 0)
return -1;
data->inputDir = inputDir;
data->base = base;
data->archName = archName;

2
tests/testutilsqemu.c
View File

@ -937,7 +937,7 @@ testQemuCapsIterate(const char *suffix,
archName++;
/* Run the user-provided callback */
if (callback(base, archName, opaque) < 0)
if (callback(TEST_QEMU_CAPS_PATH, base, archName, opaque) < 0)
goto cleanup;
}

3
tests/testutilsqemu.h
View File

@ -96,7 +96,8 @@ char *testQemuGetLatestCapsForArch(const char *arch,
const char *suffix);
virHashTablePtr testQemuGetLatestCaps(void);
typedef int (*testQemuCapsIterateCallback)(const char *base,
typedef int (*testQemuCapsIterateCallback)(const char *inputDir,
const char *base,
const char *archName,
void *opaque);
int testQemuCapsIterate(const char *suffix,