Neither qemuxml2argvtest nor qemuxml2xmltest now test configs parsed as
active, thus this flag is no longer needed.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
tests/qemuxml2argvtest.c | 3 +--
tests/qemuxml2xmltest.c | 13 +++++--------
tests/testutilsqemu.h | 3 +--
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e1a75cdd10..41e34279ce 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -373,7 +373,6 @@ testCheckExclusiveFlags(int flags)
FLAG_REAL_CAPS |
FLAG_SLIRP_HELPER |
FLAG_ALLOW_DUPLICATE_OUTPUT |
- FLAG_SKIP_CONFIG_ACTIVE |
0, -1);
return 0;
@@ -2645,7 +2644,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x");
DO_TEST_CAPS_ARCH_LATEST("s390-panic", "s390x");
DO_TEST_CAPS_LATEST("seclabel-device-multiple");
- DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-none-relabel", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-none-relabel");
DO_TEST_CAPS_LATEST("seclabel-dynamic-none");
DO_TEST_CAPS_LATEST("serial-target-port-auto");
DO_TEST_CAPS_LATEST("vhost-user-fs-sock");
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1b534aa8d0..896091f2f9 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -39,9 +39,6 @@ testXML2XMLActive(const void *opaque)
{
const testQemuInfo *info = opaque;
- if (info->flags & FLAG_SKIP_CONFIG_ACTIVE)
- return EXIT_AM_SKIP;
-
if (testXML2XMLCommon(info) < 0 ||
testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
info->infile, info->outfile, true,
@@ -485,17 +482,17 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-single", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-with-tpm", "ppc64");
- DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-baselabel", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
- DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-override", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
- DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-labelskip", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
- DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-relabel", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-baselabel");
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-override");
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-labelskip");
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-relabel");
DO_TEST_CAPS_LATEST("seclabel-static");
DO_TEST_CAPS_LATEST("seclabel-static-labelskip");
DO_TEST_CAPS_LATEST("seclabel-none");
DO_TEST_CAPS_LATEST("seclabel-dac-none");
DO_TEST_CAPS_LATEST("seclabel-dynamic-none");
DO_TEST_CAPS_LATEST("seclabel-device-multiple");
- DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-none-relabel", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-none-relabel");
DO_TEST_CAPS_LATEST("numad-static-vcpu-no-numatune");
DO_TEST_CAPS_LATEST("disk-scsi-disk-vpd");
diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index d31b7694cb..011a5993f8 100644
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -61,8 +61,7 @@ typedef enum {
FLAG_FIPS_HOST = 1 << 2, /* simulate host with FIPS mode enabled */
FLAG_REAL_CAPS = 1 << 3,
FLAG_SLIRP_HELPER = 1 << 4,
- FLAG_SKIP_CONFIG_ACTIVE = 1 << 5, /* Skip 'active' config test in qemuxml2xmltest */
- FLAG_ALLOW_DUPLICATE_OUTPUT = 1 << 6, /* allow multiple tests with the same output file */
+ FLAG_ALLOW_DUPLICATE_OUTPUT = 1 << 5, /* allow multiple tests with the same output file */
} testQemuInfoFlags;
struct testQemuConf {
--
2.43.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
