External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Move code from DO_TEST() to doCapsTest()

Browse Source 
This removes the awkard escaping and will allow us to perform
some more refactoring later on.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-03-07 14:53:18 +01:00
parent 5a8ceba2f3
commit ad340f225a
2 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/qemucapabilitiestest.c
View File

@ -176,6 +176,32 @@ testQemuCapsCopy(const void *opaque)
}
static int
doCapsTest(const char *base,
const char *archName,
testQemuDataPtr data)
{
VIR_AUTOFREE(char *) title = NULL;
VIR_AUTOFREE(char *) copyTitle = NULL;
if (virAsprintf(&title, "%s (%s)", base, archName) < 0 ||
virAsprintf(&copyTitle, "copy %s (%s)", base, archName) < 0) {
return -1;
}
data->base = base;
data->archName = archName;
if (virTestRun(title, testQemuCaps, data) < 0)
data->ret = -1;
if (virTestRun(copyTitle, testQemuCapsCopy, data) < 0)
data->ret = -1;
return 0;
}
static int
mymain(void)
{
@ -196,18 +222,8 @@ mymain(void)
#define DO_TEST(arch, name) \
do { \
VIR_AUTOFREE(char *) title = NULL; \
VIR_AUTOFREE(char *) copyTitle = NULL; \
if (virAsprintf(&title, "%s (%s)", name, arch) < 0 || \
virAsprintf(&copyTitle, "copy %s (%s)", name, arch) < 0) { \
return -EXIT_FAILURE; \
} \
data.archName = arch; \
data.base = name; \
if (virTestRun(title, testQemuCaps, &data) < 0) \
data.ret = -1; \
if (virTestRun(copyTitle, testQemuCapsCopy, &data) < 0) \
data.ret = -1; \
if (doCapsTest(name, arch, &data) < 0) \
return EXIT_FAILURE; \
} while (0)
/* Keep this in sync with qemucaps2xmltest */

28
tests/qemucaps2xmltest.c
View File

@ -173,6 +173,25 @@ testQemuCapsXML(const void *opaque)
return ret;
}
static int
doCapsTest(const char *base,
const char *archName,
testQemuDataPtr data)
{
VIR_AUTOFREE(char *) title = NULL;
if (virAsprintf(&title, "%s (%s)", base, archName) < 0)
return -1;
data->base = base;
data->archName = archName;
if (virTestRun(title, testQemuCapsXML, data) < 0)
data->ret = -1;
return 0;
}
static int
mymain(void)
{
@ -193,13 +212,8 @@ mymain(void)
#define DO_TEST(arch, name) \
do { \
VIR_AUTOFREE(char *) title = NULL; \
if (virAsprintf(&title, "%s (%s)", name, arch) < 0) \
return -EXIT_FAILURE; \
data.archName = arch; \
data.base = name; \
if (virTestRun(title, testQemuCapsXML, &data) < 0) \
data.ret = -1; \
if (doCapsTest(name, arch, &data) < 0) \
return EXIT_FAILURE; \
} while (0)
/* Keep this in sync with qemucapabilitiestest */