From nobody Wed Mar 12 17:19:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) 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 1741092141305389.4902916640566; Tue, 4 Mar 2025 04:42:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A530713F5; Tue, 4 Mar 2025 07:42:20 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7B2021479; Tue, 4 Mar 2025 07:39:10 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 134CC136C; Tue, 4 Mar 2025 07:39:05 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 CAE7D1339 for ; Tue, 4 Mar 2025 07:38:50 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-518-04owUoX7NMuHiNUsNmbjQw-1; Tue, 04 Mar 2025 07:38:49 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 956B31954126 for ; Tue, 4 Mar 2025 12:38:48 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.15]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C425119560AB for ; Tue, 4 Mar 2025 12:38:47 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741091930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tIKCd/K2rf34fzdSy1wOFFAAE2LVA4kW4nkRRyDwpec=; b=it0i5/mlXOrhrJJw8XCBPColRMEyLHnX77edf8X6lVeBy8fVcl1PqYxlfeiE8JqUJyIgyq NtexbGJ59WQ8e4Sq7Rx8Rxy77Yn4DiyhARIya8YtBsb6vrimMLMqjIDVkbTLql4mgPAl7c ffdSIy8ff3brFVBsIc2673JLnhmzEQU= X-MC-Unique: 04owUoX7NMuHiNUsNmbjQw-1 X-Mimecast-MFC-AGG-ID: 04owUoX7NMuHiNUsNmbjQw_1741091928 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 6/8] qemuxmlconftest: Propery discriminate output files for caps variants Date: Tue, 4 Mar 2025 13:38:31 +0100 Message-ID: <861ce45fbbdec7148fcd9ca6f4ae826adb8a02bf.1741091571.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JxjziZYWZC9SZ6furWzu1Z3kgMaP9epxZ2K4tqh8jzo_1741091928 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6QMCVBW5XTXI63Z23RVINAMJKCBVXJO2 X-Message-ID-Hash: 6QMCVBW5XTXI63Z23RVINAMJKCBVXJO2 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741092141733019000 Content-Type: text/plain; charset="utf-8" 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 --- ... hvf-aarch64-virt-headless.aarch64-latest+hvf.args} | 0 ...> hvf-aarch64-virt-headless.aarch64-latest+hvf.xml} | 0 ... =3D> hvf-x86_64-q35-headless.x86_64-latest+hvf.args} | 0 ...l =3D> hvf-x86_64-q35-headless.x86_64-latest+hvf.xml} | 0 tests/qemuxmlconftest.c | 10 +++++++--- tests/testutilsqemu.c | 6 +++--- 6 files changed, 10 insertions(+), 6 deletions(-) rename tests/qemuxmlconfdata/{hvf-aarch64-virt-headless.aarch64-latest.arg= s =3D> hvf-aarch64-virt-headless.aarch64-latest+hvf.args} (100%) rename tests/qemuxmlconfdata/{hvf-aarch64-virt-headless.aarch64-latest.xml= =3D> hvf-aarch64-virt-headless.aarch64-latest+hvf.xml} (100%) rename tests/qemuxmlconfdata/{hvf-x86_64-q35-headless.x86_64-latest.args = =3D> hvf-x86_64-q35-headless.x86_64-latest+hvf.args} (100%) rename tests/qemuxmlconfdata/{hvf-x86_64-q35-headless.x86_64-latest.xml = =3D> hvf-x86_64-q35-headless.x86_64-latest+hvf.xml} (100%) 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+hv= f.args diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest= .xml b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.x= ml similarity index 100% rename from tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.= xml rename to tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hv= f.xml diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.ar= gs 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.a= rgs diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xm= l 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.x= ml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 8632434760..84eea4967a 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1006,14 +1006,18 @@ testRun(const char *name, va_end(ap); info->infile =3D g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcd= ir, info->name); + if (info->flags & (FLAG_EXPECT_FAILURE | FLAG_EXPECT_PARSE_ERROR)) { - info->errfile =3D g_strdup_printf("%s/qemuxmlconfdata/%s%s.err", a= bs_srcdir, info->name, suffix); + info->errfile =3D g_strdup_printf("%s/qemuxmlconfdata/%s%s%s.err", + abs_srcdir, info->name, suffix, in= fo->args.capsvariant); } else { - info->outfile =3D g_strdup_printf("%s/qemuxmlconfdata/%s%s.args", = abs_srcdir, info->name, suffix); + info->outfile =3D g_strdup_printf("%s/qemuxmlconfdata/%s%s%s.args", + abs_srcdir, info->name, suffix, in= fo->args.capsvariant); } if (!(info->flags & FLAG_EXPECT_PARSE_ERROR)) - info->out_xml_inactive =3D g_strdup_printf("%s/qemuxmlconfdata/%s%= s.xml", abs_srcdir, info->name, suffix); + info->out_xml_inactive =3D g_strdup_printf("%s/qemuxmlconfdata/%s%= s%s.xml", + abs_srcdir, info->name, s= uffix, 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 44011c2b36..20409a6535 100644 --- 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 =3D ""; } @@ -913,9 +916,6 @@ testQemuInfoInitArgs(testQemuInfo *info) info->args.newargs =3D false; - if (!info->args.capsvariant) - info->args.capsvariant =3D ""; - if (info->args.invalidarg) { fprintf(stderr, "Invalid argument encountered by 'testQemuInfoSetA= rgs'\n"); return -1; --=20 2.48.1