]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tests: only run startup XML tests if requested
authorJán Tomko <jtomko@redhat.com>
Sat, 8 Sep 2018 21:10:23 +0000 (23:10 +0200)
committerJán Tomko <jtomko@redhat.com>
Wed, 12 Sep 2018 19:12:22 +0000 (21:12 +0200)
Use the recently introduced flag as a witness.
This reduces the apparent number of test cases
to the real number of test cases.

Note that this does not suffer from the same problem
as commit 70255fa was fixing, because the condition
for running virTestRun does not depend on results
of previous tests.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
tests/qemuxml2argvtest.c

index 244c678b9e5d583bc4b741d1a5ad7efb95d2234e..8c3029d857e148b469f42df01fec59b847a48742 100644 (file)
@@ -475,6 +475,8 @@ testCheckExclusiveFlags(int flags)
                   FLAG_STEAL_VM |
                   0, -1);
 
+    VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_FAILURE, -1);
+    VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_PARSE_ERROR, -1);
     return 0;
 }
 
@@ -842,7 +844,8 @@ mymain(void)
         if (virTestRun("QEMU XML-2-ARGV " name, \
                        testCompareXMLToArgv, &info) < 0) \
             ret = -1; \
-        if (virTestRun("QEMU XML-2-startup-XML " name, \
+        if (((flags) & FLAG_STEAL_VM) && \
+            virTestRun("QEMU XML-2-startup-XML " name, \
                        testCompareXMLToStartupXML, &info) < 0) \
             ret = -1; \
         virObjectUnref(info.qemuCaps); \