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

tests: qemuxml2argv: use varargs for CAPS flags

Browse Source 
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:15:05 -04:00
parent 24bba8797f
commit c824ce1ba0
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/qemuxml2argvtest.c
View File

@ -799,18 +799,20 @@ 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, flags, parseFlags, \ # 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,\ name, "." suffix, NULL, NULL, -1, 0, 0, \
(flags | FLAG_REAL_CAPS), parseFlags, \
}; \ }; \
if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \ if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \
capsfile))) \ capsfile))) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
if (stripmachinealiases) \ if (stripmachinealiases) \
virQEMUCapsStripMachineAliases(info.qemuCaps); \ virQEMUCapsStripMachineAliases(info.qemuCaps); \
if (testInfoSetArgs(&info, __VA_ARGS__, ARG_END) < 0) \
return EXIT_FAILURE; \
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; \
@ -819,31 +821,35 @@ mymain(void)
# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_" # define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_"
# define DO_TEST_CAPS_ARCH_VER_FULL(name, flags, parseFlags, arch, ver) \ # define DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ...) \
DO_TEST_CAPS_INTERNAL(name, arch "-" ver, flags, parseFlags, \ DO_TEST_CAPS_INTERNAL(name, arch "-" ver, \
arch, TEST_CAPS_PATH ver "." arch ".xml", false) arch, TEST_CAPS_PATH ver "." arch ".xml", false, \
__VA_ARGS__)
# define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ # define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \
DO_TEST_CAPS_ARCH_VER_FULL(name, 0, 0, arch, ver) DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END)
# define DO_TEST_CAPS_VER(name, ver) \ # define DO_TEST_CAPS_VER(name, ver) \
DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
# define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, flags, parseFlags) \ # define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \
DO_TEST_CAPS_INTERNAL(name, arch "-latest", flags, parseFlags, arch, \ DO_TEST_CAPS_INTERNAL(name, arch "-latest", arch, \
virHashLookup(capslatest, arch), true) virHashLookup(capslatest, arch), true, \
__VA_ARGS__)
# define DO_TEST_CAPS_ARCH_LATEST(name, arch) \ # define DO_TEST_CAPS_ARCH_LATEST(name, arch) \
DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, 0, 0) DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ARG_END)
# define DO_TEST_CAPS_LATEST(name) \ # define DO_TEST_CAPS_LATEST(name) \
DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") DO_TEST_CAPS_ARCH_LATEST(name, "x86_64")
# define DO_TEST_CAPS_LATEST_FAILURE(name) \ # define DO_TEST_CAPS_LATEST_FAILURE(name) \
DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", FLAG_EXPECT_FAILURE, 0) DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", \
ARG_FLAGS, FLAG_EXPECT_FAILURE)
# define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \ # define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \
DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", FLAG_EXPECT_PARSE_ERROR, 0) DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", \
ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
# define DO_TEST_FULL(name, ...) \ # define DO_TEST_FULL(name, ...) \