External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argv: Add info->{in,out}file

Browse Source 
Track infile and outfile in testInfo. This is step towards moving path
creation out of the test case, which will eventually help sharing more
code with qemuxml2xmltest.c

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 10:59:30 -04:00
parent e231798b4f
commit 2d3ba1bf06
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/qemuxml2argvtest.c
View File

@ -299,6 +299,8 @@ typedef enum {
struct testInfo { struct testInfo {
const char *name; const char *name;
const char *suffix; const char *suffix;
char *infile;
char *outfile;
virQEMUCapsPtr qemuCaps; virQEMUCapsPtr qemuCaps;
const char *migrateFrom; const char *migrateFrom;
int migrateFd; int migrateFd;
@ -427,8 +429,6 @@ static int
testCompareXMLToArgv(const void *data) testCompareXMLToArgv(const void *data)
{ {
struct testInfo *info = (void *) data; struct testInfo *info = (void *) data;
char *xml = NULL;
char *args = NULL;
char *migrateURI = NULL; char *migrateURI = NULL;
char *actualargv = NULL; char *actualargv = NULL;
const char *suffix = info->suffix; const char *suffix = info->suffix;
@ -471,9 +471,9 @@ testCompareXMLToArgv(const void *data)
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&xml, "%s/qemuxml2argvdata/%s.xml", if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml",
abs_srcdir, info->name) < 0 || abs_srcdir, info->name) < 0 ||
virAsprintf(&args, "%s/qemuxml2argvdata/%s%s.args", virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args",
abs_srcdir, info->name, suffix) < 0) abs_srcdir, info->name, suffix) < 0)
goto cleanup; goto cleanup;
@ -486,7 +486,8 @@ testCompareXMLToArgv(const void *data)
goto cleanup; goto cleanup;
parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE;
if (!(vm->def = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, if (!(vm->def = virDomainDefParseFile(info->infile,
driver.caps, driver.xmlopt,
NULL, parseFlags))) { NULL, parseFlags))) {
if (flags & FLAG_EXPECT_PARSE_ERROR) if (flags & FLAG_EXPECT_PARSE_ERROR)
goto ok; goto ok;
@ -502,7 +503,7 @@ testCompareXMLToArgv(const void *data)
goto cleanup; goto cleanup;
if (!virDomainDefCheckABIStability(vm->def, vm->def, driver.xmlopt)) { if (!virDomainDefCheckABIStability(vm->def, vm->def, driver.xmlopt)) {
VIR_TEST_DEBUG("ABI stability check failed on %s", xml); VIR_TEST_DEBUG("ABI stability check failed on %s", info->infile);
goto cleanup; goto cleanup;
} }
@ -570,7 +571,7 @@ testCompareXMLToArgv(const void *data)
if (!(actualargv = virCommandToString(cmd, false))) if (!(actualargv = virCommandToString(cmd, false)))
goto cleanup; goto cleanup;
if (virTestCompareToFile(actualargv, args) < 0) if (virTestCompareToFile(actualargv, info->outfile) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;
@ -600,8 +601,6 @@ testCompareXMLToArgv(const void *data)
virSetConnectStorage(NULL); virSetConnectStorage(NULL);
virObjectUnref(conn); virObjectUnref(conn);
VIR_FREE(migrateURI); VIR_FREE(migrateURI);
VIR_FREE(xml);
VIR_FREE(args);
return ret; return ret;
} }
@ -754,6 +753,8 @@ testInfoSetArgs(struct testInfo *info,
static void static void
testInfoClear(struct testInfo *info) testInfoClear(struct testInfo *info)
{ {
VIR_FREE(info->infile);
VIR_FREE(info->outfile);
virObjectUnref(info->qemuCaps); virObjectUnref(info->qemuCaps);
} }