qemuxmlconftest: Propery discriminate output files for caps variants

While the 'qemuxmlconftest' was able to load capability variants the
output file name didn't include the variant thus it was not possible to
test the same input file both on the default variant and on an explicit
variant.

Include the variant in the output file name and adjust two output file
names.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
similarity index 100%
rename from tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.args
rename to tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args

diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.xml
similarity index 100%
rename from tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml
rename to tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.xml

diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.args b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args
similarity index 100%
rename from tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.args
rename to tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args

diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.xml
similarity index 100%
rename from tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml
rename to tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.xml

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 863243476096a5607463a1a0f1f0c8fda7c97540..84eea4967aa5c14a1b8b6053610c18e827e4cb90 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1006,14 +1006,18 @@ testRun(const char *name,
     va_end(ap);
 
     info->infile = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir, info->name);
+
     if (info->flags & (FLAG_EXPECT_FAILURE | FLAG_EXPECT_PARSE_ERROR)) {
-        info->errfile = g_strdup_printf("%s/qemuxmlconfdata/%s%s.err", abs_srcdir, info->name, suffix);
+        info->errfile = g_strdup_printf("%s/qemuxmlconfdata/%s%s%s.err",
+                                        abs_srcdir, info->name, suffix, info->args.capsvariant);
     } else {
-        info->outfile = g_strdup_printf("%s/qemuxmlconfdata/%s%s.args", abs_srcdir, info->name, suffix);
+        info->outfile = g_strdup_printf("%s/qemuxmlconfdata/%s%s%s.args",
+                                        abs_srcdir, info->name, suffix, info->args.capsvariant);
     }
 
     if (!(info->flags & FLAG_EXPECT_PARSE_ERROR))
-        info->out_xml_inactive = g_strdup_printf("%s/qemuxmlconfdata/%s%s.xml", abs_srcdir, info->name, suffix);
+        info->out_xml_inactive = g_strdup_printf("%s/qemuxmlconfdata/%s%s%s.xml",
+                                                 abs_srcdir, info->name, suffix, info->args.capsvariant);
 
     virTestRunLog(ret, name_parse, testXMLParse, info);
     virTestRunLog(ret, name_xml, testCompareDef2XML, info);

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 44011c2b363055f4630307d4e1dcad326167d9a1..20409a6535acfdbfcc599242d49f84c95169cb07 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -754,6 +754,9 @@ testQemuInfoSetArgs(testQemuInfo *info,
         if (info->args.invalidarg)
             break;
     }
+
+    if (!info->args.capsvariant)
+        info->args.capsvariant = "";
 }
 
 
@@ -913,9 +916,6 @@ testQemuInfoInitArgs(testQemuInfo *info)
 
     info->args.newargs = false;
 
-    if (!info->args.capsvariant)
-        info->args.capsvariant = "";
-
     if (info->args.invalidarg) {
         fprintf(stderr, "Invalid argument encountered by 'testQemuInfoSetArgs'\n");
         return -1;