From nobody Mon Sep 16 19:22:31 2024 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 1706019726526247.23838106319647; Tue, 23 Jan 2024 06:22:06 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 76A3419CA; Tue, 23 Jan 2024 09:22:05 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D19C71A04; Tue, 23 Jan 2024 09:19:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8E78F18A3; Tue, 23 Jan 2024 09:19:05 -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 127B318FE for ; Tue, 23 Jan 2024 09:19:05 -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-215-YKewsC3qM_GeJiktrWFrJg-1; Tue, 23 Jan 2024 09:19:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 2F6E33821341 for ; Tue, 23 Jan 2024 14:19:02 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EF9D5012; Tue, 23 Jan 2024 14:19:00 +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: YKewsC3qM_GeJiktrWFrJg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/6] qemuxmlconftest: Populate output/error file only when needed Date: Tue, 23 Jan 2024 15:18:44 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: WR5YD6WB7LGKRXSU6WOETZEO52SI6QEE X-Message-ID-Hash: WR5YD6WB7LGKRXSU6WOETZEO52SI6QEE 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 CC: abologna@redhat.com 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: 1706019728759100001 Populate the output filename strings only when the files are expected to exist, so that other logic can be based on the presence of the strings rather than having to re-check the test flags for expected state. Signed-off-by: Peter Krempa --- tests/qemuxmlconftest.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 65953b129b..c3acfb59d5 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -585,7 +585,7 @@ testInfoCheckDuplicate(testQemuInfo *info) if (info->flags & FLAG_ALLOW_DUPLICATE_OUTPUT) return 0; - if (info->flags & (FLAG_EXPECT_FAILURE | FLAG_EXPECT_PARSE_ERROR)) + if (!path) path =3D info->errfile; if (g_hash_table_contains(info->conf->duplicateTests, path)) { @@ -994,9 +994,14 @@ testRun(const char *name, va_end(ap); info->infile =3D g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_src= dir, info->name); - info->outfile =3D g_strdup_printf("%s/qemuxml2argvdata/%s%s.args", abs= _srcdir, info->name, suffix); - info->errfile =3D g_strdup_printf("%s/qemuxml2argvdata/%s%s.err", abs_= srcdir, info->name, suffix); - info->out_xml_inactive =3D g_strdup_printf("%s/qemuxml2xmloutdata/%s%s= .xml", abs_srcdir, info->name, suffix); + if (info->flags & (FLAG_EXPECT_FAILURE | FLAG_EXPECT_PARSE_ERROR)) { + info->errfile =3D g_strdup_printf("%s/qemuxml2argvdata/%s%s.err", = abs_srcdir, info->name, suffix); + } else { + info->outfile =3D g_strdup_printf("%s/qemuxml2argvdata/%s%s.args",= abs_srcdir, info->name, suffix); + } + + if (!(info->flags & FLAG_EXPECT_PARSE_ERROR)) + info->out_xml_inactive =3D g_strdup_printf("%s/qemuxml2xmloutdata/= %s%s.xml", abs_srcdir, info->name, suffix); virTestRunLog(ret, name_parse, testXMLParse, info); virTestRunLog(ret, name_xml, testCompareDef2XML, info); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org