From nobody Mon Nov 25 09:42:06 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 From nobody Mon Nov 25 09:42:06 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=1604870732; cv=none; d=zohomail.com; s=zohoarc; b=cbXp/HuQMbv6YCYXfMim3B153NsdPf6ToQyAYnlUjtPlATbvtyR+xwSSDpeiXwzHdbe52s+igRHHIxsNfCszynnRGb0YxqI1ZAk+1ip6CbSHuz2vXmQBz9gL2eR73qe3o5Gue7e2Ma6clF9WqTE1jS9mjs6CvpTHCu89mPnMusM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604870732; 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=JkJlzl60ZUDSb/HFCB4zzN6JyB2v2E/7IaK9UYZrO4c=; b=UUQlRq0UPJcw3m0SaHCAmtqiPOPhcfgwXLHlApggBbMbhs6sxQ89yhBpL2OGbBkWSLypbs0WE2gWmZ8E7uAtMCmPOyW6z3zhrDhQ6ov7R+OYK1CourdHwQmHOs6LweX5q2igtHOlKUS+jgeTLYzytfUribe6KOxQnsX2ctrmfy0= 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 1604870732892455.5050153443756; Sun, 8 Nov 2020 13:25:32 -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-147-ZJkkPk-FP22v-Z9aVUzItQ-1; Sun, 08 Nov 2020 16:25:29 -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 126C3186840C; Sun, 8 Nov 2020 21:25:24 +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 E70D075121; Sun, 8 Nov 2020 21:25:23 +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 B81B4922F7; Sun, 8 Nov 2020 21:25:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A8LOjXr018086 for ; Sun, 8 Nov 2020 16:24:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id CF24844010; Sun, 8 Nov 2020 21:24:45 +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 C81954401F for ; Sun, 8 Nov 2020 21:24:43 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 4FB8E811E78 for ; Sun, 8 Nov 2020 21:24:43 +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-163-DvOnDpB8NgGdEZNBXs0qeA-1; Sun, 08 Nov 2020 16:24:40 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 6B93A41301 for ; Sun, 8 Nov 2020 21:24:38 +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 oHbunBiYMQSk for ; Mon, 9 Nov 2020 00:24:37 +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 608F8412D9 for ; Mon, 9 Nov 2020 00:24:37 +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:36 +0300 X-MC-Unique: ZJkkPk-FP22v-Z9aVUzItQ-1 X-MC-Unique: DvOnDpB8NgGdEZNBXs0qeA-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 2/4] tests: Fix mock chaining on macOS Date: Mon, 9 Nov 2020 00:24:29 +0300 Message-ID: <20201108212431.81896-3-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.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0A8LOjXr018086 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" Some tests in qemuxml2argvtest need opendir() from virpcimock, others need opendir() from virfilewrapper. But as of now, only opendir() from virpcimock has an effect. real_opendir in virpcimock has a pointer to opendir$INODE64 in libsystem_kernel.dylib instead of pointing to opendir$INODE64 in qemuxml2argvtest (from virfilewrapper). And because the second one is never used, tests that rely on prefixes added by virFileWrapperAddPrefix fail. That can be fixed if dlsym(3) is asked explicitly to search symbols in main executable with RTLD_MAIN_ONLY before going to other dylibs. Existing RTLD_NEXT handle results into libsystem_kernel.dylib being searched before main executable. Signed-off-by: Roman Bolshakov --- tests/virmock.h | 37 +++++++++++++++++++++++++++++++++++-- tests/virpcimock.c | 1 + 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/tests/virmock.h b/tests/virmock.h index dea5feb80f..db051f3636 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -284,8 +284,19 @@ static void (*real_##name)(void); \ void wrap_##name(void) =20 +#ifdef __APPLE__ +# define VIR_MOCK_REAL_INIT_MAIN(name, alias) \ + do { \ + if (real_##name =3D=3D NULL) { \ + real_##name =3D dlsym(RTLD_MAIN_ONLY, alias); \ + } \ + } while (0) +#else +# define VIR_MOCK_REAL_INIT_MAIN(name, alias) \ + do {} while (0) +#endif =20 -#define VIR_MOCK_REAL_INIT(name) \ +#define VIR_MOCK_REAL_INIT_NEXT(name) \ do { \ if (real_##name =3D=3D NULL && \ !(real_##name =3D dlsym(RTLD_NEXT, \ @@ -295,7 +306,7 @@ } \ } while (0) =20 -#define VIR_MOCK_REAL_INIT_ALIASED(name, alias) \ +#define VIR_MOCK_REAL_INIT_ALIASED_NEXT(name, alias) \ do { \ if (real_##name =3D=3D NULL && \ !(real_##name =3D dlsym(RTLD_NEXT, \ @@ -304,3 +315,25 @@ abort(); \ } \ } while (0) + +#ifdef VIR_MOCK_LOOKUP_MAIN +# define VIR_MOCK_REAL_INIT(name) \ + do { \ + VIR_MOCK_REAL_INIT_MAIN(name, #name); \ + VIR_MOCK_REAL_INIT_NEXT(name); \ + } while (0) +# define VIR_MOCK_REAL_INIT_ALIASED(name, alias) \ + do { \ + VIR_MOCK_REAL_INIT_MAIN(name, alias); \ + VIR_MOCK_REAL_INIT_ALIASED_NEXT(name, alias); \ + } while (0) +#else +# define VIR_MOCK_REAL_INIT(name) \ + do { \ + VIR_MOCK_REAL_INIT_NEXT(name); \ + } while (0) +# define VIR_MOCK_REAL_INIT_ALIASED(name, alias) \ + do { \ + VIR_MOCK_REAL_INIT_ALIASED_NEXT(name, alias); \ + } while (0) +#endif diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 686f894e99..4aa96cae08 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -19,6 +19,7 @@ #include =20 #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) +# define VIR_MOCK_LOOKUP_MAIN # include "virmock.h" # include # include --=20 2.29.2 From nobody Mon Nov 25 09:42:06 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=1604870700; cv=none; d=zohomail.com; s=zohoarc; b=cQT4lVtWWn0EMZ1+Sfwc0BiTKj5cvsTAegpCFg9aCVSf/3rQQpUlGaTL0ARiHwOzfuSZOpjMGCsRgF7iL5fxe9lfYv/bpAxpJ1MCNGm0Vx5tHI2loi9AhfQmmLCE1LvLdDmQoRee8jYY+gdNza2hChPdQQXR8OUy87Egd1pkrT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604870700; 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=HsNhXK1gWGDb8ElehJam++I0fOY7W0YCTf8/SmLlMRk=; b=iMXdvmYPUdV/x877JvetRxWsT2nay1hzX4BINWqp+SpdubMmzkxn5DOI1lKuF0h5W4Iu1V1/teyxKyAQbrl5VXUFELMDXCG6FNMtNTUHepDfI1cVPuNy+qMtaXTpwx9E8S84AB/jSF65qNZT5es4AdSq/zxSk11F2/fer3AIM6k= 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 1604870700662572.5910036640631; Sun, 8 Nov 2020 13:25:00 -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-xUviq-TIPtOevo7DaQRlgA-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 DEF38425D9; Sun, 8 Nov 2020 21:24:50 +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 2849355760; 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 B62A5180B657; Sun, 8 Nov 2020 21:24:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A8LOikM018070 for ; Sun, 8 Nov 2020 16:24:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 18D3B1111A40; Sun, 8 Nov 2020 21:24:44 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13B081111C9D for ; Sun, 8 Nov 2020 21:24:43 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.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 232C88007A4 for ; Sun, 8 Nov 2020 21:24:43 +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-574-KY9CvqydPLOCO3O2ocbkwQ-1; Sun, 08 Nov 2020 16:24:40 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 5F7A741303 for ; Sun, 8 Nov 2020 21:24:39 +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 NFyVFgFUbHJy for ; Mon, 9 Nov 2020 00:24:38 +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 1560C412F1 for ; Mon, 9 Nov 2020 00:24:38 +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:37 +0300 X-MC-Unique: xUviq-TIPtOevo7DaQRlgA-1 X-MC-Unique: KY9CvqydPLOCO3O2ocbkwQ-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 3/4] qemuxml2argvtest: Increase timeout on macOS Date: Mon, 9 Nov 2020 00:24:30 +0300 Message-ID: <20201108212431.81896-4-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.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0A8LOikM018070 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" The test takes 100+ seconds if all test suite is run with meson and 45+ seconds if it's run directly. According to the output of sample tool, most of the time (~72 seconds) is spent in poll(): Sort by top of stack, same collapsed (when >=3D 5): poll (in libsystem_kernel.dylib) 72396 tiny_free_no_lock (in libsystem_malloc.dylib) 1726 tiny_malloc_should_clear (in libsystem_malloc.dylib) 1671 free_tiny (in libsystem_malloc.dylib) 1287 tiny_free_list_add_ptr (in libsystem_malloc.dylib) 1258 tiny_malloc_from_free_list (in libsystem_malloc.dylib) 1256 Closes https://gitlab.com/libvirt/libvirt/-/issues/58 Signed-off-by: Roman Bolshakov --- tests/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 8decdfa20c..3b77a211bb 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -571,7 +571,13 @@ foreach data : tests ], export_dynamic: true, ) - test(data['name'], test_bin, env: tests_env) + if data['name'] =3D=3D 'qemuxml2argvtest' and host_machine.system() =3D= =3D 'darwin' + timeout =3D 180 + else + # default meson timeout + timeout =3D 30 + endif + test(data['name'], test_bin, env: tests_env, timeout: timeout) endforeach =20 =20 --=20 2.29.2 From nobody Mon Nov 25 09:42:06 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=1604870703; cv=none; d=zohomail.com; s=zohoarc; b=QrpGuErU8S8D+lW1A0U+DkWEKHypTReUH/aNXpccAWAJuJl6S0pAHI3aYXYPUH3jIzBJl/+YU12VBP8Pk+PT5I5vAbwPPvMfM3Qk7sAsGhP3txKb7Irf+uBImxyQ5JEervXO93wgW5ey+WdpkAvha77SQmslfkkNTVBoqT1xjj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604870703; 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=8bGP5+tQ2hqYF5kql/4Ei906pz1bF3a4XavBlBHj+EA=; b=hl/t6XkhGFiq5sNu6yD5ah0Cf0nqjxGNgCQ+MhqVzT4CGgIh8Dcbz6bLxiwoFMk2q3DGU9+aqv47CSNlOwwYnctM31aLWto2DGXNHFwf88WVpnKpZmEhm8mYb6Es8+PeLTp1yuR2UN9tnX91NZcIGAUh0M36bykwJewZh+LI/iY= 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 1604870703994137.81649026965863; Sun, 8 Nov 2020 13:25:03 -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-NBTOMFCaMoqzr4OMDOGpVQ-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 351EE8030C5; Sun, 8 Nov 2020 21:24:51 +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 E99E65577A; 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 57E6E44A6C; Sun, 8 Nov 2020 21:24:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A8LOj1r018085 for ; Sun, 8 Nov 2020 16:24:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id CF2C244014; Sun, 8 Nov 2020 21:24:45 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7F0144019 for ; Sun, 8 Nov 2020 21:24:44 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 1A9801021F83 for ; Sun, 8 Nov 2020 21:24:44 +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-37-kUwASfyLMuSORwwTkoDjQg-1; Sun, 08 Nov 2020 16:24:41 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id EC0E5412F1 for ; Sun, 8 Nov 2020 21:24:39 +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 y8eR45sbFoGZ for ; Mon, 9 Nov 2020 00:24:39 +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 174CE412D9 for ; Mon, 9 Nov 2020 00:24:39 +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:38 +0300 X-MC-Unique: NBTOMFCaMoqzr4OMDOGpVQ-1 X-MC-Unique: kUwASfyLMuSORwwTkoDjQg-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 4/4] ci: Run test suite on macOS Date: Mon, 9 Nov 2020 00:24:31 +0300 Message-ID: <20201108212431.81896-5-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.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0A8LOj1r018085 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" There's no need to have different CI process between macOS and FreeBSD as test suite has been fixed on macOS. Signed-off-by: Roman Bolshakov --- ci/cirrus/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 912284b906..dc1cccd135 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -20,5 +20,4 @@ build_task: - git reset --hard "$CI_COMMIT_SHA" build_script: - meson build --prefix=3D$(pwd)/install-root - - if test "$(uname)" =3D "FreeBSD"; then ninja -C build dist; fi - - if test "$(uname)" =3D "Darwin"; then ninja -C build && ninja -C bui= ld install; fi + - ninja -C build dist --=20 2.29.2