External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argv: remove full testInfo initialization

Browse Source 
Only initialize the fields that are passed in

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-03-13 19:26:08 -04:00
parent c824ce1ba0
commit 504492a63d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/qemuxml2argvtest.c
View File

@ -799,11 +799,12 @@ mymain(void)
* the test cases should be forked using DO_TEST_CAPS_VER with the appropriate * the test cases should be forked using DO_TEST_CAPS_VER with the appropriate
* version. * version.
*/ */
# define DO_TEST_CAPS_INTERNAL(name, suffix, \ # define DO_TEST_CAPS_INTERNAL(_name, _suffix, \
arch, capsfile, stripmachinealiases, ...) \ arch, capsfile, stripmachinealiases, ...) \
do { \ do { \
static struct testInfo info = { \ static struct testInfo info = { \
name, "." suffix, NULL, NULL, -1, 0, 0, \ .name = _name, \
.suffix = "." _suffix, \
}; \ }; \
if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \ if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \
capsfile))) \ capsfile))) \
@ -813,7 +814,7 @@ mymain(void)
if (testInfoSetArgs(&info, __VA_ARGS__, ARG_END) < 0) \ if (testInfoSetArgs(&info, __VA_ARGS__, ARG_END) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
info.flags |= FLAG_REAL_CAPS; \ info.flags |= FLAG_REAL_CAPS; \
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; \
virObjectUnref(info.qemuCaps); \ virObjectUnref(info.qemuCaps); \
@ -852,16 +853,16 @@ mymain(void)
ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR) ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
# define DO_TEST_FULL(name, ...) \ # define DO_TEST_FULL(_name, ...) \
do { \ do { \
static struct testInfo info = { \ static struct testInfo info = { \
name, NULL, NULL, NULL, -1, 0, 0, \ .name = _name, \
}; \ }; \
if (!(info.qemuCaps = virQEMUCapsNew())) \ if (!(info.qemuCaps = virQEMUCapsNew())) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (testInfoSetArgs(&info, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) < 0) \ if (testInfoSetArgs(&info, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) < 0) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (virTestRun("QEMU XML-2-ARGV " name, \ if (virTestRun("QEMU XML-2-ARGV " _name, \
testCompareXMLToArgv, &info) < 0) \ testCompareXMLToArgv, &info) < 0) \
ret = -1; \ ret = -1; \
virObjectUnref(info.qemuCaps); \ virObjectUnref(info.qemuCaps); \