openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: qemuhelp: convert to virTestLoadFilePath 

As a sample usage of the new helper convert the calls in qemuhelptest to
the new helper.

Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2017-07-25 15:13:33 +02:00
parent d492b19259
commit b650caedf1
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/qemuhelptest.c
View File

@ -44,7 +44,6 @@ static void printMismatchedFlags(virQEMUCapsPtr got,
static int testHelpStrParsing(const void *data) static int testHelpStrParsing(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
char *path = NULL;
char *help = NULL; char *help = NULL;
unsigned int version, kvm_version; unsigned int version, kvm_version;
bool is_kvm; bool is_kvm;
@ -53,10 +52,7 @@ static int testHelpStrParsing(const void *data)
char *got = NULL; char *got = NULL;
char *expected = NULL; char *expected = NULL;
if (virAsprintf(&path, "%s/qemuhelpdata/%s", abs_srcdir, info->name) < 0) if (!(help = virTestLoadFilePath("qemuhelpdata/", info->name, NULL)))
return -1;
if (virTestLoadFile(path, &help) < 0)
goto cleanup; goto cleanup;
if (!(flags = virQEMUCapsNew())) if (!(flags = virQEMUCapsNew()))
@ -76,13 +72,8 @@ static int testHelpStrParsing(const void *data)
virQEMUCapsSet(flags, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(flags, QEMU_CAPS_MONITOR_JSON);
# endif # endif
VIR_FREE(path);
VIR_FREE(help); VIR_FREE(help);
if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir, if (!(help = virTestLoadFilePath("qemuhelpdata/", info->name, "-device", NULL)))
info->name) < 0)
goto cleanup;
if (virTestLoadFile(path, &help) < 0)
goto cleanup; goto cleanup;
if (virQEMUCapsParseDeviceStr(flags, help) < 0) if (virQEMUCapsParseDeviceStr(flags, help) < 0)
@ -125,7 +116,6 @@ static int testHelpStrParsing(const void *data)
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(path);
VIR_FREE(help); VIR_FREE(help);
virObjectUnref(flags); virObjectUnref(flags);
VIR_FREE(got); VIR_FREE(got);