From nobody Sat Nov 23 14:34:09 2024 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 1724761639771962.939880678298; Tue, 27 Aug 2024 05:27:19 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 87A4B11C7; Tue, 27 Aug 2024 08:27:18 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5327F1182; Tue, 27 Aug 2024 08:27:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 87A80B9E; Tue, 27 Aug 2024 08:27:00 -0400 (EDT) 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 E7B27B25 for ; Tue, 27 Aug 2024 08:26:59 -0400 (EDT) Received: from mx-prod-mc-05.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-46-uVw6VleDNxmr4udSQXA1Kw-1; Tue, 27 Aug 2024 08:26:57 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1AC391955F3F for ; Tue, 27 Aug 2024 12:26:57 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 27A8C30001A1 for ; Tue, 27 Aug 2024 12:26:55 +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.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724761619; 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; bh=zWNCA3Hrr8fHjhERT3C5+cSBDIVVxdtx2vgTCRQKRY8=; b=i/zxQucBS6/GLRa8UZU2CTCSsUddZ2/k/vuqsV+xlaT5Ec45vt/VhcPQnWSJZ+ffuGt8EB sFDiXLvTpsk1WypdCpfv8EsrDS2YjshOuzrs0s1tozR8p3W305+Z8F3grNqUR2xOO7HgFR 8ikE0kG1qDZhLoDkAfRqsqIkV0C0VCQ= X-MC-Unique: uVw6VleDNxmr4udSQXA1Kw-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH] virschematest: Replace g_lstat() with virFileIsLink() Date: Tue, 27 Aug 2024 14:26:53 +0200 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PP2DCL4RZXFKS64AJ6POEPETZKVFJSD6 X-Message-ID-Hash: PP2DCL4RZXFKS64AJ6POEPETZKVFJSD6 X-MailFrom: mprivozn@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: 1724761640945116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Inside of virschematest.c there's testSchemaDir() which iterates over dentries in given directory but skips some files: those without ".xml" suffix, hidden files, symlinks, etc. Now, symlinks are detected as g_lstat() + S_ISLNK() combo which works, except it fails to compile on mingw where is no concept of symlinks. Replace the combo with a call to virFileIsLink() which at least allows us to compile cleanly on mingw. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- The reason this isn't detected by our CI is that we explicitly build libvirt with -Dtests=3Ddisabled which I missed when debugging latest build error on mingw. tests/virschematest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index 20ac495f4a..83bc945711 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -125,8 +125,7 @@ testSchemaDir(const char *schema, continue; if (ent->d_name[0] =3D=3D '.') continue; - if (g_lstat(ent->d_name, &sb) >=3D 0 && - S_ISLNK(sb.st_mode)) + if (virFileIsLink(ent->d_name)) continue; if (filter && !g_regex_match(filter, ent->d_name, 0, NULL)) --=20 2.44.2