From nobody Mon Nov 25 12:22:53 2024 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=1604870702; cv=none; d=zohomail.com; s=zohoarc; b=WnuFccjkEL+g5RRDoY/FhgrsjI4fgsAw6u+aDNbohLN+sgTmDrsf9QHEikMMWqggrk3Au7D+mncs46wmnYvIjB3aIlfa+Br1wFV12otpx/2yEkZxdSrwixE/+fPgNuBnMGb26EYmL3NnxIxKbstBtfGN8YV656ItMwrZo0O2WuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604870702; 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=FvpxKwZr1UR7tyBU//XxcKGQJGjZwVWnC20uzzzd9wY=; b=YdwkQ88PaHvgWnGZ8LtuhNVF9NjMF5tpeoBtyZ+hTpyBthhfsNsgbKnnOQJSwLdNgCgRepTi3jgmjTlwTXr5l+S5AgvKuG5gZbMlhlWqAEj9W7ap98ViwzVMBu3OHO34NQcKpEL8UN5AQhfm+t/md6pWD7ZclJIEdi5Owts+hjE= 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 1604870702856681.8639916902097; Sun, 8 Nov 2020 13:25:02 -0800 (PST) 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-219-oJK4bbTwNEWnZDwl175-rA-1; Sun, 08 Nov 2020 16:24:56 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC3361074651; Sun, 8 Nov 2020 21:24:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B97EB62A15; Sun, 8 Nov 2020 21:24:50 +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 B5FD2CF4D; Sun, 8 Nov 2020 21:24:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A8LOi6M018068 for ; Sun, 8 Nov 2020 16:24:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0EA1A2166B44; Sun, 8 Nov 2020 21:24:44 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0936E2166B28 for ; Sun, 8 Nov 2020 21:24:42 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 E104F85829E for ; Sun, 8 Nov 2020 21:24:41 +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-106-CH7ym_LHNl-hNEhr2y3Fzw-1; Sun, 08 Nov 2020 16:24:39 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 71EFD412F5 for ; Sun, 8 Nov 2020 21:24:37 +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 zEl-64HgIBFk for ; Mon, 9 Nov 2020 00:24:36 +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 87247412F1 for ; Mon, 9 Nov 2020 00:24:36 +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; Mon, 9 Nov 2020 00:24:35 +0300 X-MC-Unique: oJK4bbTwNEWnZDwl175-rA-1 X-MC-Unique: CH7ym_LHNl-hNEhr2y3Fzw-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 1/4] tests: Fix opendir mocks on macOS Date: Mon, 9 Nov 2020 00:24:28 +0300 Message-ID: <20201108212431.81896-2-r.bolshakov@yadro.com> In-Reply-To: <20201108212431.81896-1-r.bolshakov@yadro.com> References: <20201108212431.81896-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.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0A8LOi6M018068 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.79 on 10.5.11.15 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" opendir() mocks need to search for decorated function with $INODE64 suffix, like stat mocks. Signed-off-by: Roman Bolshakov Reviewed-by: Michal Privoznik --- tests/virfilewrapper.c | 4 ++++ tests/virpcimock.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 0500a3617e..ca2356b5c9 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -56,7 +56,11 @@ static void init_syms(void) VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT(mkdir); VIR_MOCK_REAL_INIT(open); +# ifdef __APPLE__ + VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); +# else VIR_MOCK_REAL_INIT(opendir); +# endif VIR_MOCK_REAL_INIT(execv); VIR_MOCK_REAL_INIT(execve); } diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 5cd688c825..686f894e99 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -935,7 +935,11 @@ init_syms(void) VIR_MOCK_REAL_INIT(__open_2); # endif /* ! __GLIBC__ */ VIR_MOCK_REAL_INIT(close); +# ifdef __APPLE__ + VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); +# else VIR_MOCK_REAL_INIT(opendir); +# endif VIR_MOCK_REAL_INIT(virFileCanonicalizePath); } =20 --=20 2.29.2