From nobody Sat May 18 15:49:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1692891966; cv=none; d=zohomail.com; s=zohoarc; b=ZuFmlvXJQmWZM6mr93f34/mbXxPJDWOv3vojrjpheNJ1XXFeeiQQuCyXwg/tFhB3NxnXb6vzug/xwnKp9z8XVKoKSJB6mTFLI/vS9hyWZEIJM/wu6IV4lFtwXI7dToKk0gh+5VIl258i5qxY9zqvoF0UAGe246cErYn5VW943Cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692891966; h=Content-Type:Content-Transfer-Encoding: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=j/AnkSK5wQtrRpPOzSXpIeWLKzOpsRwXHqo7+mnmkTA=; b=Ks6KU/GDoRab4ue/dMwP2oG0Ly5f5JWSP1lvAYY9Buyu8mstTzRRvhlTy+xieu+TeRzeYjzwxJRgsIKh0kBZ409ba5GM8ldwY9W4w2OIMyywojF3b13JNKlLYMeeqrcbIRpW98SxgqrxjiZCTamIP7Sxv70iuslf0lwzOsIgcuM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1692891966352887.5612015751747; Thu, 24 Aug 2023 08:46:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-140-AhcycHiOM9qyLMsizMtphg-1; Thu, 24 Aug 2023 11:46:01 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8DC238D40B9; Thu, 24 Aug 2023 15:45:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 715ED40D283D; Thu, 24 Aug 2023 15:45:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3A82619465A0; Thu, 24 Aug 2023 15:45:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E17861946589 for ; Thu, 24 Aug 2023 15:45:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CF9971121315; Thu, 24 Aug 2023 15:45:47 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6247E1121314 for ; Thu, 24 Aug 2023 15:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692891965; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=j/AnkSK5wQtrRpPOzSXpIeWLKzOpsRwXHqo7+mnmkTA=; b=JNA+OAfmQiUwOJkp9AvnqvcGDmSpnOBrvjPXXO9+FbVN4ULUlaJig6BU7+zGRfxFHXuS7H 2bHBOs6KlR+p1xGU+ArrmiS80uoEXhM+SG+HzK8XH48bP3nSJA796OJlUeKlZAOd0wNCmJ Drs+ThUcu2Zglhym2HywCSkJJsADuDs= X-MC-Unique: AhcycHiOM9qyLMsizMtphg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] ci: Fix precedence between arguments passed to meson Date: Thu, 24 Aug 2023 17:45:44 +0200 Message-ID: <20230824154545.607778-2-abologna@redhat.com> In-Reply-To: <20230824154545.607778-1-abologna@redhat.com> References: <20230824154545.607778-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692891968748100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 9c9848f955fd merged $MESON_OPTS into $MESON_ARGS, and while doing so changed their behavior: while until then the contents of $MESON_ARGS had precedence over those of $MESON_OPTS, now the opposite is true. Restore the original behavior and document it. The argument for merging the two variables in the first place was that having both present on the meson command line could be confusing; however, that should no longer be the case now that we have reasonably extensive comments explaining the role of each of the variables and how they interact with each other, so return the meson command line to its original form. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- ci/build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index ed9b1f4473..0e07b2e59d 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -12,10 +12,12 @@ export VIR_TEST_DEBUG=3D1 # populated either from a GitLab's job configuration or from command line = as # `$ helper build --meson-configure-args=3D-Dopt1 -Dopt2` when run in a lo= cal # containerized environment +# +# The contents of $MESON_ARGS (defined locally) should take precedence over +# those of $MESON_OPTS (defined when the container was built), so they're +# passed to meson after them =20 -MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" - -meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS || \ +meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 ninja -C build $NINJA_ARGS --=20 2.41.0 From nobody Sat May 18 15:49:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1692891981; cv=none; d=zohomail.com; s=zohoarc; b=RJxlSY5aunNvZnmfGSE0bP9RojTqLlwFoIxZtsMvM5otzpsZdhicGnVNLEGZCRDVFs7xQhunr39mwZD20SpoeqRm5dSrmXq4kcX8Wj+A+33i9O7oACQ0bt7+s1m8ktiQMPO9+HembCnQBgO163yCPEILq/gccTpBUx7HUjNYOdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692891981; h=Content-Type:Content-Transfer-Encoding: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=FIyy4cnD+iT4VVEr8/OXAdOkBtO6RmmpjZ8WezNPfGo=; b=ne8ABRUisIOwmAdLtg4MKkJtAXEs4dyYAXWtFzYnNXQLiFyN6cEnvADawN1/M10P/6lZAQBuVbURVvkoFJxxLYk3adlNbtLkRr3RoWUiatNV4Wc09hOubF5PvSayuzuPwMQJjfrRqfsPPtjx1EbN0sXO7s7TMNJ1DJs7AFACVns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1692891981406704.8392768722332; Thu, 24 Aug 2023 08:46:21 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-402-QHsSQVPWOzuK6oBwlEu1kQ-1; Thu, 24 Aug 2023 11:46:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C2066855710; Thu, 24 Aug 2023 15:46:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD60640C2073; Thu, 24 Aug 2023 15:46:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7394F19465B9; Thu, 24 Aug 2023 15:45:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A14161946589 for ; Thu, 24 Aug 2023 15:45:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8CFCE1121315; Thu, 24 Aug 2023 15:45:48 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FEA81121314 for ; Thu, 24 Aug 2023 15:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692891980; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FIyy4cnD+iT4VVEr8/OXAdOkBtO6RmmpjZ8WezNPfGo=; b=hu9kTv4mg7qQUVp57TitXlCIfE8mtkC3t8U+meLJ/eeUUNelN2G/kdAp4JOFd4uU3IDMrX zKKCZKKqoHrKvRb+zmoyx20HFJqy/HPTicmyXPSHyfjpSKqk3YBm7HhRPTDf2uYyK9COCQ XkbVHhB+qCrmW6ENc6myWQaedlm5T9w= X-MC-Unique: QHsSQVPWOzuK6oBwlEu1kQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] ci: Fix quoting and option name Date: Thu, 24 Aug 2023 17:45:45 +0200 Message-ID: <20230824154545.607778-3-abologna@redhat.com> In-Reply-To: <20230824154545.607778-1-abologna@redhat.com> References: <20230824154545.607778-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692891983370100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Multiple values passed to --meson-args need to be quoted so that the shell will interpret them correctly. The option's name was also reported incorrectly, so fix that as well. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index 0e07b2e59d..d5ed8ad104 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -10,7 +10,7 @@ export VIR_TEST_DEBUG=3D1 # # $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's # populated either from a GitLab's job configuration or from command line = as -# `$ helper build --meson-configure-args=3D-Dopt1 -Dopt2` when run in a lo= cal +# `$ helper build --meson-args=3D'-Dopt1 -Dopt2'` when run in a local # containerized environment # # The contents of $MESON_ARGS (defined locally) should take precedence over --=20 2.41.0