From nobody Mon May 6 01:21:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606169470; cv=none; d=zohomail.com; s=zohoarc; b=lZx+ASBuKEvsJt8zuyz/GkR3kVOfOnfmv/LeaahoM7txVqOUZgI2u6+NPFW6p4FNo+787VCsTMBpC/0S0mohlb0rMzvP/NVV1jYUe47ckamD9018tyfVWxxOwzmP1f4u+pgtHYVzSuwq2mJ9upumLWeE3xJM+YNlKGZXdqx+vaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606169470; 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=Ape9Kf/ybECTc5Esf59xMwTKQbcqkJ17RVcEo6Xkzj4=; b=LBAmXiQEK5ur6ta2/KQwV5qwBv24gEjnpmVuIcurKS/98+TC7nBpnu7ntQX8SxR8gsuo046+21bjVV8z4gwIy/NAfUJS3C7dSn+1kOrPU91Ce1V87fW9kC8vQNa7bpMBjiq1KtaFo8kdtPZJttOiTqCUFy/wK30+KpoGynMUc3w= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606169470002558.6616791837871; Mon, 23 Nov 2020 14:11:10 -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-508-22zj75yuOeuHmS64OFQbHg-1; Mon, 23 Nov 2020 17:11:06 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9C62100C60E; Mon, 23 Nov 2020 22:10:58 +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 BA0E06087C; Mon, 23 Nov 2020 22:10:58 +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 8901A473A2; Mon, 23 Nov 2020 22:10:58 +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 0ANMAWw8031383 for ; Mon, 23 Nov 2020 17:10:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id ED1562EF83; Mon, 23 Nov 2020 22:10:31 +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 E75F52EF87 for ; Mon, 23 Nov 2020 22:10:31 +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 D2C4D10580C0 for ; Mon, 23 Nov 2020 22:10:31 +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-234-yGFwXO0INCSH1BMCWaR4AQ-1; Mon, 23 Nov 2020 17:10:26 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 4FEDB412FC; Mon, 23 Nov 2020 22:10:24 +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 pWS9GfKbg7oq; Tue, 24 Nov 2020 01:10:23 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (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 60213412EB; Tue, 24 Nov 2020 01:10:21 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Tue, 24 Nov 2020 01:10:21 +0300 X-MC-Unique: 22zj75yuOeuHmS64OFQbHg-1 X-MC-Unique: yGFwXO0INCSH1BMCWaR4AQ-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 1/6] tests: Fix opendir mocks on macOS Date: Tue, 24 Nov 2020 01:10:13 +0300 Message-ID: <20201123221018.47896-2-r.bolshakov@yadro.com> In-Reply-To: <20201123221018.47896-1-r.bolshakov@yadro.com> References: <20201123221018.47896-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-03.corp.yadro.com (172.17.100.103) 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 0ANMAWw8031383 X-loop: libvir-list@redhat.com Cc: Michal Privoznik , 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.13 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. Reviewed-by: Michal Privoznik Signed-off-by: Roman Bolshakov --- 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 May 6 01:21:24 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=1606169449; cv=none; d=zohomail.com; s=zohoarc; b=htIzYuWmipGCrsxB9ElkdOewdyDNc5Ktw2EKIvk4kr7wQUvBTdXsB0ZGLOrip3KItCqOhItybZthXxggFuhfpgq90shB/u1NlkcYgusoLy167jCP37Rki975ImE00EkTrXE+emiudlC3sOeSpWmxgsrEH/ytRPt9lM4fambYwhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606169449; 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=2V6yhyyYA4bJkAERCxB2CRR8BcesrCQsoVgIraisBKs=; b=Q1QQtisqkB4sa/8kmGJZZaNYIm1j/kYA0ZXnzbc2kX3lBdNM++QYp4tNcLtFmbGc5/CTCQ072L3hGMHY+3eLhL4oLwjZyUOSzmyryFL2xfkGxSBBByPmUpumg6uqv1uOns2bzT7KR5uLxuOaNbcOkQ/E/ESPT2rK4GUfej8f8O8= 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 1606169449123798.9885501787336; Mon, 23 Nov 2020 14:10:49 -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-101-8mA0JQd_PYS_M57topHEOg-1; Mon, 23 Nov 2020 17:10:44 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94143805BE5; Mon, 23 Nov 2020 22:10:36 +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 6EEB560C04; Mon, 23 Nov 2020 22:10:36 +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 05B531809CB7; Mon, 23 Nov 2020 22:10:36 +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 0ANMAW5G031385 for ; Mon, 23 Nov 2020 17:10:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1359C2026D16; Mon, 23 Nov 2020 22:10:32 +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 0DEFE2026D13 for ; Mon, 23 Nov 2020 22:10:29 +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 B369A811E85 for ; Mon, 23 Nov 2020 22:10:29 +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-557-UxtlJa2XN4eQO4KlZmI9rA-1; Mon, 23 Nov 2020 17:10:27 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 6557F412EB for ; Mon, 23 Nov 2020 22:10:25 +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 H6zwjO7MtGos for ; Tue, 24 Nov 2020 01:10:24 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (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 E2C8A412EC for ; Tue, 24 Nov 2020 01:10:21 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Tue, 24 Nov 2020 01:10:21 +0300 X-MC-Unique: 8mA0JQd_PYS_M57topHEOg-1 X-MC-Unique: UxtlJa2XN4eQO4KlZmI9rA-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 2/6] tests: Fix mock chaining on macOS Date: Tue, 24 Nov 2020 01:10:14 +0300 Message-ID: <20201123221018.47896-3-r.bolshakov@yadro.com> In-Reply-To: <20201123221018.47896-1-r.bolshakov@yadro.com> References: <20201123221018.47896-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-03.corp.yadro.com (172.17.100.103) 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 0ANMAW5G031385 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.12 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 Reviewed-by: Michal Privoznik --- tests/virmock.h | 13 +++++++++++++ tests/virpcimock.c | 1 + 2 files changed, 14 insertions(+) diff --git a/tests/virmock.h b/tests/virmock.h index dea5feb80f..5250e733a1 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -284,9 +284,21 @@ static void (*real_##name)(void); \ void wrap_##name(void) =20 +#if defined(VIR_MOCK_LOOKUP_MAIN) && defined(__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) \ do { \ + VIR_MOCK_REAL_INIT_MAIN(name, #name); \ if (real_##name =3D=3D NULL && \ !(real_##name =3D dlsym(RTLD_NEXT, \ #name))) { \ @@ -297,6 +309,7 @@ =20 #define VIR_MOCK_REAL_INIT_ALIASED(name, alias) \ do { \ + VIR_MOCK_REAL_INIT_MAIN(name, alias); \ if (real_##name =3D=3D NULL && \ !(real_##name =3D dlsym(RTLD_NEXT, \ alias))) { \ 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 May 6 01:21:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606169462; cv=none; d=zohomail.com; s=zohoarc; b=YunMeQT+pEmiSlG/F96UhTePPB7grpmNhFw+kSSto4BdM1RgWxlB3pywRks2R/GtDkAbmGCgITh7hzHi3mHG3fTJ0I0gmBtF2FxP2OZHtCFi/c8ur2f8yfIyvqDKtQbINw5csQKk9ODt1jrxcYPDqCrOjle/hncmPZbxAWbqt5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606169462; 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=e4gryEsuLY75P7jVAM6q5ZQO0kuPuiDcnpJZWs8Kk8s=; b=DKkBz86bxPmxHMNodvCT64ZL7rol3D4UmapHBsG5bEU9SOhTsiLPPGXAv4lpKxoA/+1WMiaHwgjsX56iR+9a4Eb0Hr7/xDYoEnm1NOXIUDxe2yhrfMHX8ge8zvajYfiN5AqIHgz5ERJawxAQnLIeD0+k+la+UO5SDAc0lGnw6aQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606169462038957.0687366352951; Mon, 23 Nov 2020 14:11: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-36-zuE5Tz9HNJy7ueZsblcp2w-1; Mon, 23 Nov 2020 17:10:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01FBA805BFE; Mon, 23 Nov 2020 22:10: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 C8F795C1CF; Mon, 23 Nov 2020 22:10:49 +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 90E1350053; Mon, 23 Nov 2020 22:10:49 +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 0ANMAWBU031386 for ; Mon, 23 Nov 2020 17:10:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 16C6C2026D13; Mon, 23 Nov 2020 22:10:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1136E2026D14 for ; Mon, 23 Nov 2020 22:10:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (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 09D191871CC5 for ; Mon, 23 Nov 2020 22:10:31 +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-285-WOgqcKGkN_a3UxCLmzVhjw-1; Mon, 23 Nov 2020 17:10:27 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id B0EAF412FD for ; Mon, 23 Nov 2020 22:10:25 +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 sdGUZ7Jdc4zN for ; Tue, 24 Nov 2020 01:10:24 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (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 6363E412EF for ; Tue, 24 Nov 2020 01:10:22 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Tue, 24 Nov 2020 01:10:22 +0300 X-MC-Unique: zuE5Tz9HNJy7ueZsblcp2w-1 X-MC-Unique: WOgqcKGkN_a3UxCLmzVhjw-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS Date: Tue, 24 Nov 2020 01:10:15 +0300 Message-ID: <20201123221018.47896-4-r.bolshakov@yadro.com> In-Reply-To: <20201123221018.47896-1-r.bolshakov@yadro.com> References: <20201123221018.47896-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-03.corp.yadro.com (172.17.100.103) 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 0ANMAWBU031386 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.16 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 40+ seconds on MBP 2012, MBA 2015. Cirrus completes the test within default timeout, just above 29 seconds but the error margin is narrow, under a second. It'd be good to provide reasonable default timeout to avoid test suite failure if "meson test" is invoked without arguments. Closes https://gitlab.com/libvirt/libvirt/-/issues/58 Signed-off-by: Roman Bolshakov Reviewed-by: Michal Privoznik --- tests/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index f88410ff33..cb06873ba5 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -574,7 +574,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 90 + 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 May 6 01:21:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606169474; cv=none; d=zohomail.com; s=zohoarc; b=dILUgCktK9bMiUzYLk8Ljd7A+BzS9OjLYKoieT+BLNWSJy6yhSuUwBKc3yE6GVmKoYrGkGZIoL2qRtZs7G8GdflhO0lkp0sXR8NbyudppEuuIkrSp0LZ8lB1zs3sbhJq6OUHfWfpOxOxv0vrTm1/WHyuiM+iVJc+h4tmv0z27ZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606169474; 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=ntZBrybrjQ3u6XP6tfGzk+lc+yhK3Vm62Q9Aoexnq6cuTscXpBw8zLGdV5NTBkpw1xWJ/GkDXQ4AS7Gq5lEuvTcvX8tdjLfqrclmeEnkSDr6VFdknWuxVoZ4+9fGG0n1ujz3bkidLmyhFBDGUGgnEtpppWvBKC7q99qmXRwyaAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606169474718545.7736043120963; Mon, 23 Nov 2020 14:11:14 -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-424-QH3GNankPqavtQMORyV88g-1; Mon, 23 Nov 2020 17:11:10 -0500 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 B28129A233; Mon, 23 Nov 2020 22:11:04 +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 8C5CC10016FB; Mon, 23 Nov 2020 22:11:04 +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 59496180B65B; Mon, 23 Nov 2020 22:11:04 +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 0ANMAYhu031428 for ; Mon, 23 Nov 2020 17:10:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id F01D11112872; Mon, 23 Nov 2020 22:10:33 +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 EC4961112871 for ; Mon, 23 Nov 2020 22:10:31 +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 87E4685829F for ; Mon, 23 Nov 2020 22:10:31 +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-556-OkhrDXguM9yvypypCWLa8w-1; Mon, 23 Nov 2020 17:10:28 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 61D0A412EC for ; Mon, 23 Nov 2020 22:10:26 +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 qIqjaJArXls0 for ; Tue, 24 Nov 2020 01:10:25 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (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 D8D95412EE for ; Tue, 24 Nov 2020 01:10:22 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Tue, 24 Nov 2020 01:10:22 +0300 X-MC-Unique: QH3GNankPqavtQMORyV88g-1 X-MC-Unique: OkhrDXguM9yvypypCWLa8w-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 4/6] ci: Run test suite on macOS Date: Tue, 24 Nov 2020 01:10:16 +0300 Message-ID: <20201123221018.47896-5-r.bolshakov@yadro.com> In-Reply-To: <20201123221018.47896-1-r.bolshakov@yadro.com> References: <20201123221018.47896-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-03.corp.yadro.com (172.17.100.103) 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 0ANMAYhu031428 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" 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 Reviewed-by: Michal Privoznik --- 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 From nobody Mon May 6 01:21:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606169452; cv=none; d=zohomail.com; s=zohoarc; b=cSW6gao+ETD0nmPbLtXRzJb+F8t96VXOzm8obDD62iWZ7FeEfF78d7bEDzTUC7en/Sbrgj6ZFu/GpZrMCawb1ZoFL/vzfmLIyVpLsZ1j99rGQwQtg4aoZwBQL1q3B6aFTo5xk8aTKC4bWyP4W3vNAFGAauZZpldmQ+gMBKl5Xuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606169452; 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=SkcOfz2aAp4H9YUk3P8+3hXpUuk4KjWwhn6OuAwux64=; b=iF9AcW0B8KJNrfoMDPVECZK7CyVbGGBFGNfoGrZat6JGsRBpRmTPyGovlJuqKZxSJPpxwstBXfu81O+vtxA5VJvMjz0GMEQpyoW2fG65OrTQbGt2e9yyezOqdHtOchEp5iBLtiTK2FM6y1qyzRroGZCE3pE9GB/t5dSoaLq5KBM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606169452886727.9566064978922; Mon, 23 Nov 2020 14:10:52 -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-94-T60TCppBN4au0fnroZ1tlQ-1; Mon, 23 Nov 2020 17:10:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FD95100A641; Mon, 23 Nov 2020 22:10:39 +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 0C89860C62; Mon, 23 Nov 2020 22:10:39 +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 CDDB650049; Mon, 23 Nov 2020 22:10:38 +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 0ANMAYL7031425 for ; Mon, 23 Nov 2020 17:10:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id E3E452026D12; Mon, 23 Nov 2020 22:10:33 +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 DEAFC2026D49 for ; Mon, 23 Nov 2020 22:10:33 +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 CAA24858299 for ; Mon, 23 Nov 2020 22:10:33 +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-214-IEUsUI4jNROHdY5Vgt31oQ-1; Mon, 23 Nov 2020 17:10:30 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id BBEE2412EF for ; Mon, 23 Nov 2020 22:10:26 +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 vEPPcYZHP8pw for ; Tue, 24 Nov 2020 01:10:25 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (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 691B6412F2 for ; Tue, 24 Nov 2020 01:10:23 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Tue, 24 Nov 2020 01:10:23 +0300 X-MC-Unique: T60TCppBN4au0fnroZ1tlQ-1 X-MC-Unique: IEUsUI4jNROHdY5Vgt31oQ-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 5/6] tests: Delay mock creation Date: Tue, 24 Nov 2020 01:10:17 +0300 Message-ID: <20201123221018.47896-6-r.bolshakov@yadro.com> In-Reply-To: <20201123221018.47896-1-r.bolshakov@yadro.com> References: <20201123221018.47896-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-03.corp.yadro.com (172.17.100.103) 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 0ANMAYL7031425 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.12 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 might be mocks that need to reference qemu test driver and link with it. It's not possible now because qemu test driver is defined after mocks. While at it, add 'link_with' parameter to mock definition that allows to specify a set of libraries the mock has to be linked with. Signed-off-by: Roman Bolshakov Reviewed-by: Michal Privoznik --- tests/meson.build | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index cb06873ba5..ef8ded1ea4 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -115,24 +115,6 @@ if conf.has('WITH_SECDRIVER_SELINUX') ] endif =20 -foreach mock : mock_libs - shared_library( - mock['name'], - mock.get('sources', [ '@0@.c'.format(mock['name']) ]), - override_options: [ - 'b_asneeded=3Dfalse', - 'b_lundef=3Dfalse', - ], - dependencies: [ - tests_dep, - mock.get('deps', []), - ], - link_with: [ - libvirt_lib, - ], - ) -endforeach - =20 # build libraries used by tests =20 @@ -201,6 +183,24 @@ test_file_wrapper_lib =3D static_library( dependencies: [ tests_dep ], ) =20 +foreach mock : mock_libs + shared_library( + mock['name'], + mock.get('sources', [ '@0@.c'.format(mock['name']) ]), + override_options: [ + 'b_asneeded=3Dfalse', + 'b_lundef=3Dfalse', + ], + dependencies: [ + tests_dep, + mock.get('deps', []), + ], + link_with: [ + libvirt_lib, + mock.get('link_with', []), + ], + ) +endforeach =20 # build helpers used by tests =20 --=20 2.29.2 From nobody Mon May 6 01:21:24 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=1606169464; cv=none; d=zohomail.com; s=zohoarc; b=ailVgUQO9pxGKbRzj5bhgWTbviSeqbx6dT6W8BrpvUdKOWLB+Y4+FgVqqQdESWQfiha0cstcFf/I9kxeoNNhdYk7NYm4XRxOJNMiI2NWN/jeoFlTwg+qvWgsLq/8VO5cZo7IQJlHw24ayiZW0o3DsVkaoIzfNTHEu/FdpdH9N44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606169464; 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=4MFQq3np9aOr1xfKCZ4S51PzA6bhO1qoiA52HMeSOKo=; b=CnxWcmQMwyssYGt2pp0YhSmMD3vPAhtJS/lp09RQpC+RbRAR9ByarjmJDGlnY1QAlmt+tq9dQ/GSe3sbEAK6JkD/9DZf95MF1NCiH60lNSlZMHmm87b2w5vIy/go34XkQgO6pMqU71LLMCjvmutrge2gG/ZUDLhD1wgFDTBbo9A= 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 1606169464897973.9299146057773; Mon, 23 Nov 2020 14:11:04 -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-167-P_Uo2fv3OWymfSE2PBwc0w-1; Mon, 23 Nov 2020 17:11:00 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 871929A237; Mon, 23 Nov 2020 22:10:52 +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 64ACE5C1BB; Mon, 23 Nov 2020 22:10:52 +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 30B1F5005A; Mon, 23 Nov 2020 22:10:52 +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 0ANMAYQ9031427 for ; Mon, 23 Nov 2020 17:10:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id E8A1423155; Mon, 23 Nov 2020 22:10:33 +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 E34671730C for ; Mon, 23 Nov 2020 22:10:33 +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 D00EE811E85 for ; Mon, 23 Nov 2020 22:10:33 +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-72-OgUjXhKeNBWGkHaUR47mHg-1; Mon, 23 Nov 2020 17:10:30 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 6C4CD412EE for ; Mon, 23 Nov 2020 22:10:27 +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 hkQirUgkEvyy for ; Tue, 24 Nov 2020 01:10:26 +0300 (MSK) Received: from T-EXCH-03.corp.yadro.com (t-exch-03.corp.yadro.com [172.17.100.103]) (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 E84694124F for ; Tue, 24 Nov 2020 01:10:23 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-03.corp.yadro.com (172.17.100.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Tue, 24 Nov 2020 01:10:23 +0300 X-MC-Unique: P_Uo2fv3OWymfSE2PBwc0w-1 X-MC-Unique: OgUjXhKeNBWGkHaUR47mHg-1 X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 6/6] qemucapsprobemock: Fix lookup of qemu functions Date: Tue, 24 Nov 2020 01:10:18 +0300 Message-ID: <20201123221018.47896-7-r.bolshakov@yadro.com> In-Reply-To: <20201123221018.47896-1-r.bolshakov@yadro.com> References: <20201123221018.47896-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-03.corp.yadro.com (172.17.100.103) 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 0ANMAYQ9031427 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.16 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" qemucapsprobemock can't find real versions of qemuMonitorSend() and qemuMonitorJSONIOProcessLine() on macOS. That breaks qemucapsprobe. The failure can be explained by documented behaviour of dlsym(3) on macOS: If dlsym() is called with the special handle RTLD_NEXT, then dyld searches for the symbol in the dylibs the calling image linked against when built. [...] For flat linked images, the search starts in the load ordered list of all images, in the image right after the caller's image. That means qemucapsprobemock must be linked against qemu test driver to find symbols there with RTLD_NEXT. Signed-off-by: Roman Bolshakov Reviewed-by: Michal Privoznik --- tests/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index ef8ded1ea4..cc0657f3c1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -101,7 +101,6 @@ endif if conf.has('WITH_QEMU') mock_libs +=3D [ { 'name': 'qemucaps2xmlmock' }, - { 'name': 'qemucapsprobemock' }, { 'name': 'qemucpumock' }, { 'name': 'qemuhotplugmock' }, { 'name': 'qemuxml2argvmock' }, @@ -171,6 +170,10 @@ if conf.has('WITH_QEMU') link_whole: [ qemu_driver_impl ], link_with: [ libvirt_lib ], ) + + mock_libs +=3D [ + { 'name': 'qemucapsprobemock', 'link_with': [ test_qemu_driver_lib ] }, + ] else test_qemu_driver_lib =3D [] test_utils_qemu_lib =3D [] --=20 2.29.2