shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

tests: qemuxml2xml: Break out testInfoSet*Paths

Browse Source 
These will need to be separate to share testInfo with qemuxml2argv

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-03-31 12:21:45 -04:00
parent 17f160b288
commit 05388311b6
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/qemuxml2xmltest.c
View File

@ -129,16 +129,11 @@ testInfoSetCommon(struct testInfo *info,
return -1;
}
static int
testInfoSet(struct testInfo *info,
testInfoSetPaths(struct testInfo *info,
const char *name,
int when,
int gic)
int when)
{
if (testInfoSetCommon(info, gic) < 0)
return -1;
if (virAsprintf(&info->inName, "%s/qemuxml2argvdata/%s.xml",
abs_srcdir, name) < 0)
goto error;
@ -186,13 +181,9 @@ testInfoSet(struct testInfo *info,
static const char *statusPath = abs_srcdir "/qemustatusxml2xmldata/";
static int
testInfoSetStatus(struct testInfo *info,
const char *name,
int gic)
testInfoSetStatusPaths(struct testInfo *info,
const char *name)
{
if (testInfoSetCommon(info, gic) < 0)
return -1;
if (virAsprintf(&info->inName, "%s%s-in.xml", statusPath, name) < 0 ||
virAsprintf(&info->outActiveName, "%s%s-out.xml", statusPath, name) < 0)
goto error;
@ -236,7 +227,8 @@ mymain(void)
# define DO_TEST_FULL(name, when, gic, ...) \
do { \
if (testInfoSet(&info, name, when, gic) < 0) { \
if (testInfoSetCommon(&info, gic) < 0 || \
testInfoSetPaths(&info, name, when) < 0) { \
VIR_TEST_DEBUG("Failed to generate test data for '%s'", name); \
return -1; \
} \
@ -1256,7 +1248,8 @@ mymain(void)
# define DO_TEST_STATUS(name) \
do { \
if (testInfoSetStatus(&info, name, GIC_NONE) < 0) { \
if (testInfoSetCommon(&info, GIC_NONE) < 0 || \
testInfoSetStatusPaths(&info, name) < 0) { \
VIR_TEST_DEBUG("Failed to generate status test data for '%s'", name); \
return -1; \
} \