From nobody Fri Oct 18 06:24:12 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 1706019837337906.8308085707579; Tue, 23 Jan 2024 06:23:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 422A6608; Tue, 23 Jan 2024 09:23:56 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4C3EB1900; Tue, 23 Jan 2024 09:19:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id C399F19BB; Tue, 23 Jan 2024 09:19:09 -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 934ED1900 for ; Tue, 23 Jan 2024 09:19:07 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-okCW7ZjKPL2hnYFAdqrUow-1; Tue, 23 Jan 2024 09:19:05 -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 19B9C85A58A for ; Tue, 23 Jan 2024 14:19:05 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0662B5012; Tue, 23 Jan 2024 14:19:02 +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_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: okCW7ZjKPL2hnYFAdqrUow-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 3/6] qemuxmlconftest: Check also output files for usage Date: Tue, 23 Jan 2024 15:18:45 +0100 Message-ID: <6ff261746e4fccd5c07d6cdf59c4ef8f3034f47f.1706017336.git.pkrempa@redhat.com> 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: QM3RTTLL72NI3WDTXXOSWNSUEBDZGXXJ X-Message-ID-Hash: QM3RTTLL72NI3WDTXXOSWNSUEBDZGXXJ 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: 1706019837709100001 Include also the output files in the validation of used files. Signed-off-by: Peter Krempa --- tests/qemuxmlconftest.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index c3acfb59d5..cb19e7b27d 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -633,6 +633,12 @@ testQemuConfXMLCommon(testQemuInfo *info, /* mark test case as used */ ignore_value(g_hash_table_remove(info->conf->existingTestCases, info->= infile)); + if (info->outfile) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, in= fo->outfile)); + if (info->errfile) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, in= fo->errfile)); + if (info->out_xml_inactive) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, in= fo->out_xml_inactive)); if (testQemuInfoInitArgs((testQemuInfo *) info) < 0) goto cleanup; @@ -925,7 +931,7 @@ testConfXMLCheck(GHashTable *existingTestCases) if (ret =3D=3D 0) fprintf(stderr, "\n"); - fprintf(stderr, "unused input file: %s\n", (const char *) items[i]= .key); + fprintf(stderr, "unused file: %s\n", (const char *) items[i].key); ret =3D -1; } @@ -949,7 +955,9 @@ testConfXMLEnumerate(GHashTable *existingTestCases) return -1; while ((rc =3D virDirRead(dir, &ent, abs_srcdir "/qemuxml2argvdata")) = > 0) { - if (virStringHasSuffix(ent->d_name, ".xml")) { + if (virStringHasSuffix(ent->d_name, ".xml") || + virStringHasSuffix(ent->d_name, ".args") || + virStringHasSuffix(ent->d_name, ".err")) { g_hash_table_insert(existingTestCases, g_strdup_printf(abs_srcdir "/qemuxml2argvd= ata/%s", ent->d_name), NULL); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org