From nobody Fri Apr 26 12:59:58 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620026976; cv=none; d=zohomail.com; s=zohoarc; b=Kl3hajLG6SgFnNWGZkboaEewPuqaKys4rU5Z4z7GUvUZfdN05Bkya5iSs6qnW0goUszrbTs/W7WDMkjPa5EvjsUQ1M1E0DHGV5gsyWgfJISbzHx9KRNKkNccfxZjRoqPuLMcq8ZcPsjKMujL2m1YHwMm/EZPga+yjFEyNy+YJGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620026976; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5/CaoFrc/gj4V52VvEkWewueI42IxMjN6Fh7r6rc2IM=; b=DOpAya2l1CZb3183jn+SYT2jtRAqE2ty+kH1ocGmpKam6drMgfzk7rwXh6XWFhvDQPWPEF62uux9DLSr49eIN4PI0TBrfgYXPFlTKNhXo45VMAQiQ3Yc0GP8Hm0S4QPWDdmgvemigoZZZr02qGgeAdMvNMsy3Uj0T3sns4mcPB8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 162002697675326.09585567222723; Mon, 3 May 2021 00:29:36 -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-523-YiISR3ptMiOn-_knh-XsrA-1; Mon, 03 May 2021 03:29:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 236E2107ACCD; Mon, 3 May 2021 07:29:24 +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 089293CC9; Mon, 3 May 2021 07:29: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 3D1BD1800BBE; Mon, 3 May 2021 07:29:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1437TK72018744 for ; Mon, 3 May 2021 03:29:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id EDD8319D7C; Mon, 3 May 2021 07:29:19 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C41072B442; Mon, 3 May 2021 07:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620026972; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5/CaoFrc/gj4V52VvEkWewueI42IxMjN6Fh7r6rc2IM=; b=EFL6CQkJGk1qiMTNfk3PDyQPntUXIbK/WHDpiw1a5oFuREOvzideT090j6fYc4TVc+Ysv2 d1tBjdP68B3Feegs1B/6dEPyMJhPJxUPPoi/QApkdUL6GPUm4+cif2X4PUvrGKcxZcZBOw 9eQ2r8EVyIWuuaOfN/z/ovzHRx2Rs8s= X-MC-Unique: YiISR3ptMiOn-_knh-XsrA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Fix compatibility with Meson 0.58 Date: Mon, 3 May 2021 09:29:12 +0200 Message-Id: <20210503072912.47884-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: jdenemar@redhat.com 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.23 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Builds failed with tests/meson.build:690:0: ERROR: List item must be one of , not before this change. https://gitlab.com/libvirt/libvirt/-/issues/158 Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/296072074 (hasn't completed yet) Should we consider this for 7.3.0? It would be great if people who have a very new version of Meson would be able to build the new version of libvirt out of the box. tests/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index 05c3e90195..9900983d0c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -687,12 +687,12 @@ foreach name : test_scripts test(name, script, env: tests_env) endforeach =20 +testenv =3D runutf8 +testenv +=3D 'VIR_TEST_FILE_ACCESS=3D1' + add_test_setup( 'access', - env: [ - 'VIR_TEST_FILE_ACCESS=3D1', - runutf8, - ], + env: testenv, exe_wrapper: [ python3_prog, check_file_access_prog.path() ], ) =20 --=20 2.26.3