[PATCH 5/5] qemuxml2xmltest: Merge DO_TEST macro into DO_TEST_CAPS_INTERNAL
Now all tests invoke a real-capability version. Remove DO_TEST.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index f6be677694..895e24d522 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -146,28 +146,24 @@ mymain(void)
virSetConnectSecret(conn);
virSetConnectStorage(conn);
-#define DO_TEST_FULL(_name, suffix, ...) \
+#define DO_TEST_CAPS_INTERNAL(_name, arch, ver, ...) \
do { \
static struct testQemuInfo info = { \
.name = _name, \
}; \
- testQemuInfoSetArgs(&info, &testConf, __VA_ARGS__); \
+ testQemuInfoSetArgs(&info, &testConf, \
+ ARG_CAPS_ARCH, arch, \
+ ARG_CAPS_VER, ver, \
+ __VA_ARGS__, ARG_END); \
\
- testInfoSetPaths(&info, suffix, "inactive"); \
+ testInfoSetPaths(&info, "." arch "-" ver,
"inactive"); \
virTestRunLog(&ret, "QEMU XML-2-XML-inactive " _name,
testXML2XMLInactive, &info); \
\
- testInfoSetPaths(&info, suffix, "active"); \
+ testInfoSetPaths(&info, "." arch "-" ver,
"active"); \
virTestRunLog(&ret, "QEMU XML-2-XML-active " _name,
testXML2XMLActive, &info); \
testQemuInfoClear(&info); \
} while (0)
-#define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \
- DO_TEST_FULL(name, "." arch "-" ver, \
- ARG_CAPS_ARCH, arch, \
- ARG_CAPS_VER, ver, \
- __VA_ARGS__, \
- ARG_END)
-
#define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \
DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__)
--
2.41.0