From nobody Tue Feb 10 00:57:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1603035151; cv=none; d=zohomail.com; s=zohoarc; b=UP/VTVOjSsajsWa5Id8oh+4jAMwnEyWuqQIXe+mziCVZ6Np26VFcVmOLFxQorWazxTBcN6/XpqNb9YoYU3bJ4eH62RUKcThO5+3j01ePx8oNNy5FUQ1Zb6IczNzkwONKdHpLqTl2KGAnBfVD9+CH7v6PDZbax460tAO0K2+1kDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603035151; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JZn5f/8Dq8AZXwnLoqIyHdi4TYbDZn8yO5j1OoXGVlk=; b=Fho0RYSsoYU78l2oM/xqw6O5q1TCymmcRJKriCcpevzDhRZxHROacNrU7pmKIdDS7aVo+jN9pD3iIly+TB5Xbvrq1L8tnYvizV8kwh8rgiTVXhs1jYKj6UcGyoD/gxqtDzneo0uCll/+alxJ5OqhbN4jKeFZuQK7zpKGUywKzrA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160303515104756.512957020370095; Sun, 18 Oct 2020 08:32:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-YrOdyFdeOAWmIb4sbHWTXg-1; Sun, 18 Oct 2020 11:32:27 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E7D71DDE2; Sun, 18 Oct 2020 15:32:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C9A11007619; Sun, 18 Oct 2020 15:32:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 096E9180B791; Sun, 18 Oct 2020 15:32:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09IFVpeM017462 for ; Sun, 18 Oct 2020 11:31:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8A8F1202450A; Sun, 18 Oct 2020 15:31:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85D732024508 for ; Sun, 18 Oct 2020 15:31:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 283CC811E76 for ; Sun, 18 Oct 2020 15:31:49 +0000 (UTC) Received: from mta-01.yadro.com (mta-02.yadro.com [89.207.88.252]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-YUKLwlyaO3OjsyUxpaVv2A-1; Sun, 18 Oct 2020 11:31:46 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id D5A81412FB for ; Sun, 18 Oct 2020 15:31:43 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FV-22uX0jBOw for ; Sun, 18 Oct 2020 18:31:42 +0300 (MSK) Received: from T-EXCH-04.corp.yadro.com (t-exch-04.corp.yadro.com [172.17.100.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id BA415412F4 for ; Sun, 18 Oct 2020 18:31:42 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-04.corp.yadro.com (172.17.100.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Sun, 18 Oct 2020 18:31:41 +0300 X-MC-Unique: YrOdyFdeOAWmIb4sbHWTXg-1 X-MC-Unique: YUKLwlyaO3OjsyUxpaVv2A-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 2/3] tests: Re-introduce stat/lstat mocks on macOS Date: Sun, 18 Oct 2020 18:30:57 +0300 Message-ID: <20201018153058.20385-3-r.bolshakov@yadro.com> In-Reply-To: <20201018153058.20385-1-r.bolshakov@yadro.com> References: <20201018153058.20385-1-r.bolshakov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-04.corp.yadro.com (172.17.100.104) X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 09IFVpeM017462 X-loop: libvir-list@redhat.com Cc: Roman Bolshakov X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit d6b17edd5163 ("tests: Lookup extended stat/lstat in mocks") adds support for mocking of stat() and lstat() on macOS. The change was broken because virmockstathelpers.c only follows glibc logic and MOCK_STAT and MOCK_LSTAT are not getting defined on macOS. Signed-off-by: Roman Bolshakov --- tests/virmockstathelpers.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index a251fc1267..5c9759551d 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -55,6 +55,10 @@ * Unfortunately, because we are trying to mock replace the C library, * we need to know about this internal impl detail. * + * On macOS stat() and lstat() are resolved to _stat$INODE64 and + * _lstat$INODE64, respectively. stat(2) man page also declares that + * stat64(), lstat64() and fstat64() are deprecated. + * * With all this in mind the list of functions we have to mock will depend * on several factors * @@ -68,8 +72,10 @@ =20 =20 =20 -#if defined(WITH_STAT) && !defined(WITH___XSTAT) && !defined(WITH_STAT64) -# define MOCK_STAT +#if defined(WITH_STAT) +# if !defined(WITH___XSTAT) && !defined(WITH_STAT64) || defined(__APPLE__) +# define MOCK_STAT +# endif #endif #if defined(WITH_STAT64) && !defined(WITH___XSTAT64) # define MOCK_STAT64 @@ -80,8 +86,10 @@ #if defined(WITH___XSTAT64) # define MOCK___XSTAT64 #endif -#if defined(WITH_LSTAT) && !defined(WITH___LXSTAT) && !defined(WITH_LSTAT6= 4) -# define MOCK_LSTAT +#if defined(WITH_LSTAT) +# if !defined(WITH___LXSTAT) && !defined(WITH_LSTAT64) || defined(__APPLE_= _) +# define MOCK_LSTAT +# endif #endif #if defined(WITH_LSTAT64) && !defined(WITH___LXSTAT64) # define MOCK_LSTAT64 --=20 2.28.0