Re: [libvirt] [PATCH v2 1/4] tests: Reorder DO_TEST_CAPS_*() macros

Make sure the order is consistent between xml2argv and xml2xml, and make room for more macros that are going to be introduced shortly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- tests/qemuxml2argvtest.c | 13 ++++++------- tests/qemuxml2xmltest.c | 29 ++++++++++++++--------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 91ca35d469..f4603d36c2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -712,21 +712,21 @@ mymain(void) ARG_CAPS_VER, ver, \ __VA_ARGS__) -# define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ - DO_TEST_CAPS_INTERNAL(name, arch, ver, ARG_END) - -# define DO_TEST_CAPS_VER(name, ver) \ - DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) - # define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \ DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__) # define DO_TEST_CAPS_ARCH_LATEST(name, arch) \ DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ARG_END) +# define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ + DO_TEST_CAPS_INTERNAL(name, arch, ver, ARG_END) + # define DO_TEST_CAPS_LATEST(name) \ DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") +# define DO_TEST_CAPS_VER(name, ver) \ + DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) + # define DO_TEST_CAPS_LATEST_FAILURE(name) \ DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", \ ARG_FLAGS, FLAG_EXPECT_FAILURE) @@ -735,7 +735,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", \ ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR) - # define DO_TEST_FULL(name, ...) \ DO_TEST_INTERNAL(name, "", \ __VA_ARGS__, QEMU_CAPS_LAST)