External/libvirt
1
0
Fork 0
Code

tests: qemuxml2argv: add testInfoSetPaths

Browse Source 
This moves infile and outfile building outside the test case,
which better fits the pattern of qemuxml2xmltest. It also lets us
drop the qemuxml2argtest-specific 'suffix' from testInfo

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 11:08:19 -04:00
parent 2d3ba1bf06
commit 180bf85c72
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/qemuxml2argvtest.c
View File

@ -298,7 +298,6 @@ typedef enum {
struct testInfo { struct testInfo {
const char *name; const char *name;
const char *suffix;
char *infile; char *infile;
char *outfile; char *outfile;
virQEMUCapsPtr qemuCaps; virQEMUCapsPtr qemuCaps;
@ -431,7 +430,6 @@ testCompareXMLToArgv(const void *data)
struct testInfo *info = (void *) data; struct testInfo *info = (void *) data;
char *migrateURI = NULL; char *migrateURI = NULL;
char *actualargv = NULL; char *actualargv = NULL;
const char *suffix = info->suffix;
unsigned int flags = info->flags; unsigned int flags = info->flags;
unsigned int parseFlags = info->parseFlags; unsigned int parseFlags = info->parseFlags;
int ret = -1; int ret = -1;
@ -448,9 +446,6 @@ testCompareXMLToArgv(const void *data)
if (!(conn = virGetConnect())) if (!(conn = virGetConnect()))
goto cleanup; goto cleanup;
if (!suffix)
suffix = "";
conn->secretDriver = &fakeSecretDriver; conn->secretDriver = &fakeSecretDriver;
conn->storageDriver = &fakeStorageDriver; conn->storageDriver = &fakeStorageDriver;
conn->nwfilterDriver = &fakeNWFilterDriver; conn->nwfilterDriver = &fakeNWFilterDriver;
@ -471,12 +466,6 @@ testCompareXMLToArgv(const void *data)
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml",
abs_srcdir, info->name) < 0 ||
virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args",
abs_srcdir, info->name, suffix) < 0)
goto cleanup;
if (info->migrateFrom && if (info->migrateFrom &&
!(migrateURI = qemuMigrationDstGetURI(info->migrateFrom, !(migrateURI = qemuMigrationDstGetURI(info->migrateFrom,
info->migrateFd))) info->migrateFd)))
@ -758,6 +747,20 @@ testInfoClear(struct testInfo *info)
virObjectUnref(info->qemuCaps); virObjectUnref(info->qemuCaps);
} }
static int
testInfoSetPaths(struct testInfo *info,
const char *suffix)
{
if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml",
abs_srcdir, info->name) < 0 ||
virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args",
abs_srcdir, info->name, suffix ? suffix : "") < 0) {
return -1;
}
return 0;
}
# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX"
static int static int
@ -883,11 +886,14 @@ mymain(void)
do { \ do { \
static struct testInfo info = { \ static struct testInfo info = { \
.name = _name, \ .name = _name, \
.suffix = _suffix, \
}; \ }; \
if (testInfoSetArgs(&info, capslatest, \ if (testInfoSetArgs(&info, capslatest, \
__VA_ARGS__, ARG_END) < 0) \ __VA_ARGS__, ARG_END) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (testInfoSetPaths(&info, _suffix) < 0) { \
VIR_TEST_DEBUG("Failed to generate paths for '%s'", _name); \
return EXIT_FAILURE; \
} \
if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \ if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \
testCompareXMLToArgv, &info) < 0) \ testCompareXMLToArgv, &info) < 0) \
ret = -1; \ ret = -1; \