From nobody Wed Jan 15 08:35:25 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170473180582861.03994000818295; Mon, 8 Jan 2024 08:36:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id BA8D81A46; Mon, 8 Jan 2024 11:36:44 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4B4FD1ABE; Mon, 8 Jan 2024 11:07:35 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9C52219AE; Mon, 8 Jan 2024 11:06:48 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 149FD19EC for ; Mon, 8 Jan 2024 11:06:10 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-zay-1k0VNS2r3EPu-pqMRQ-1; Mon, 08 Jan 2024 11:06:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1B5D29AC01C for ; Mon, 8 Jan 2024 16:06:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CDB4C15A0C for ; Mon, 8 Jan 2024 16:06:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: zay-1k0VNS2r3EPu-pqMRQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 12/23] qemuxml2*test: Remove FLAG_SKIP_CONFIG_ACTIVE flag Date: Mon, 8 Jan 2024 17:05:42 +0100 Message-ID: <8daf057b649ed83d5aa1e76dc5f591c085cd7d7b.1704729291.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: D4XZ25UUX7BAARXYAAS6ZGRFFRN2QTKJ X-Message-ID-Hash: D4XZ25UUX7BAARXYAAS6ZGRFFRN2QTKJ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704731807575100001 Neither qemuxml2argvtest nor qemuxml2xmltest now test configs parsed as active, thus this flag is no longer needed. Signed-off-by: Peter Krempa --- 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 =3D 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", A= RG_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", AR= G_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 =3D 1 << 2, /* simulate host with FIPS mode en= abled */ FLAG_REAL_CAPS =3D 1 << 3, FLAG_SLIRP_HELPER =3D 1 << 4, - FLAG_SKIP_CONFIG_ACTIVE =3D 1 << 5, /* Skip 'active' config test in qe= muxml2xmltest */ - FLAG_ALLOW_DUPLICATE_OUTPUT =3D 1 << 6, /* allow multiple tests with t= he same output file */ + FLAG_ALLOW_DUPLICATE_OUTPUT =3D 1 << 5, /* allow multiple tests with t= he same output file */ } testQemuInfoFlags; struct testQemuConf { --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org