[libvirt] [PATCH 4/8] tests: Use virAsprintf() to build titles

We're using static string concatenation at the moment, but that will no longer be a possibility in a bit. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- tests/qemucapabilitiestest.c | 11 ++++++++--- tests/qemucaps2xmltest.c | 13 +++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index e3c6681dd4..222ac05d79 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -196,12 +196,17 @@ mymain(void) #define DO_TEST(arch, name) \ do { \ + VIR_AUTOFREE(char *) title = NULL; \ + VIR_AUTOFREE(char *) copyTitle = NULL; \ + if (virAsprintf(&title, "%s (%s)", name, arch) < 0 || \ + virAsprintf(&copyTitle, "copy %s (%s)", name, arch) < 0) { \ + return -EXIT_FAILURE; \ + } \ data.archName = arch; \ data.base = name; \ - if (virTestRun(name "(" arch ")", testQemuCaps, &data) < 0) \ + if (virTestRun(title, testQemuCaps, &data) < 0) \ data.ret = -1; \ - if (virTestRun("copy " name "(" arch ")", \ - testQemuCapsCopy, &data) < 0) \ + if (virTestRun(copyTitle, testQemuCapsCopy, &data) < 0) \ data.ret = -1; \ } while (0) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 46d2ce8b44..be460b42f8 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -197,10 +197,15 @@ mymain(void) return EXIT_FAILURE; #define DO_TEST(arch, name) \ - data.archName = arch; \ - data.base = name; \ - if (virTestRun(name "(" arch ")", testQemuCapsXML, &data) < 0) \ - data.ret = -1 + do { \ + VIR_AUTOFREE(char *) title = NULL; \ + if (virAsprintf(&title, "%s (%s)", name, arch) < 0) \ + return -EXIT_FAILURE; \ + data.archName = arch; \ + data.base = name; \ + if (virTestRun(title, testQemuCapsXML, &data) < 0) \ + data.ret = -1; \ + } while (0) /* Keep this in sync with qemucapabilitiestest */ DO_TEST("x86_64", "caps_1.5.3"); -- 2.20.1