From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6DC9FA09D3; Thu, 12 Nov 2020 17:39:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 52BCE569B; Thu, 12 Nov 2020 17:39:16 +0100 (CET) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 21C114CA6 for ; Thu, 12 Nov 2020 17:39:15 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id CB8305C023C; Thu, 12 Nov 2020 11:39:12 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 12 Nov 2020 11:39:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=M4WyZ92NIAu0Les3Cynx1H60an VPOKh0NFiHZrrHSUI=; b=IYRgP2M7NZ2Vkc/QBQJTYouJgJqZBVatcBZBFj0YqB ILDQki/9X0S+Y0m3YcWWRrhzCEwqwKf+7kY+FJH/YhsWtoT3ySXZL+n/G/gLkJTA zgEcHyo6lSdFqWzVMzSxjEh8gmbFFmuyrt/jiD/vkJv9OORBbkD3Ip+8uHN7Pm7n Wp9T9RGebZ0AM7n95v2qYNq2ZGgD2zqP34nR4shhFRCDf/dnV5m6lhLRRtAWxihw WbwVG2X3Ra6AsGnRaBKuGfzABOSAMdwmXQBIpbDLC1ANNyKPMiB03qyhr01RRQwt 48qVKL8JVixRjJ/o5fHsdsacyBm5bK7rPj86AdxCK4Rw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=M4WyZ92NIAu0Les3C ynx1H60anVPOKh0NFiHZrrHSUI=; b=Lx9eVl2RywcXO6eLyZvLcJFI++HKclSB9 x3nyWhzNpWJMp+ySMOnn6cYmmmSYLbCd8lymJXLL3Vn1x7JKaX5rhkJ+1TuwiBLA a2rgU7t6f5R1uPN0mYuBQZGCFr17fOKo//KaGEbqQvr8yUwS3FfK8h8oMNEzYL8s GWjPiEgOMlPu02/76N6LRHrbjbv2+0BEgeX7WXFEhrO6OFSv5lc3MjN8L/LscDW+ zdZQUjgBHXU3bzi5w8KKoJpjcQD6+HMogMuxev0oMYdBBHwbfne7k1U0H2g4xPah sBdHmdiESLqCnUt3lwRj8CN0cno3lhoc6ypm//YXHYaiNQ1ve4DDQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvfedgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhho nhhjrghlohhnrdhnvghtqeenucggtffrrghtthgvrhhnpedvledvudehvdduudevuedvve ehgeduleegiefgjeehudehtddtgeduffejiefhgfenucfkphepjeejrddufeegrddvtdef rddukeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id C18503067EEE; Thu, 12 Nov 2020 11:39:11 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com Date: Thu, 12 Nov 2020 17:39:01 +0100 Message-Id: <20201112163901.1728959-1-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 1/1] devtools: rename build test verbosity variables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" For consistency with other variables which can be set from the env, TEST_MESON_BUILD_VERBOSE and TEST_MESON_BUILD_VERY_VERBOSE are renamed DPDK_BUILD_TEST_VERBOSE and DPDK_BUILD_TEST_VERY_VERBOSE. The handling of the verbosity level is also moved upper in the script, closer to other initializations. Signed-off-by: Thomas Monjalon --- devtools/test-meson-builds.sh | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 3ce49368cf..d3122fbc73 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -43,6 +43,22 @@ default_cflags=$CFLAGS default_ldflags=$LDFLAGS default_meson_options=$DPDK_MESON_OPTIONS +if [ "$1" = "-vv" ] ; then + DPDK_BUILD_TEST_VERY_VERBOSE=1 + DPDK_BUILD_TEST_VERBOSE=1 +elif [ "$1" = "-v" ] ; then + DPDK_BUILD_TEST_VERBOSE=1 +fi +# we can't use plain verbose when we don't have pipefail option so up-level +if [ -z "$PIPEFAIL" -a -n "$DPDK_BUILD_TEST_VERBOSE" ] ; then + echo "# Missing pipefail shell option, changing VERBOSE to VERY_VERBOSE" + DPDK_BUILD_TEST_VERY_VERBOSE=1 +fi +[ -n "$DPDK_BUILD_TEST_VERBOSE" ] && exec 8>&1 || exec 8>/dev/null +verbose=8 +[ -n "$DPDK_BUILD_TEST_VERY_VERBOSE" ] && exec 9>&1 || exec 9>/dev/null +veryverbose=9 + check_cc_flags () # ... { echo 'int main(void) { return 0; }' | @@ -108,11 +124,11 @@ config () # compile () # { builddir=$1 - if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then + if [ -n "$DPDK_BUILD_TEST_VERY_VERBOSE" ] ; then # for full output from ninja use "-v" echo "$ninja_cmd -v -C $builddir" $ninja_cmd -v -C $builddir - elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then + elif [ -n "$DPDK_BUILD_TEST_VERBOSE" ] ; then # for keeping the history of short cmds, pipe through cat echo "$ninja_cmd -C $builddir | cat" $ninja_cmd -C $builddir | cat @@ -180,22 +196,6 @@ build () # fi } -if [ "$1" = "-vv" ] ; then - TEST_MESON_BUILD_VERY_VERBOSE=1 - TEST_MESON_BUILD_VERBOSE=1 -elif [ "$1" = "-v" ] ; then - TEST_MESON_BUILD_VERBOSE=1 -fi -# we can't use plain verbose when we don't have pipefail option so up-level -if [ -z "$PIPEFAIL" -a -n "$TEST_MESON_BUILD_VERBOSE" ] ; then - echo "# Missing pipefail shell option, changing VERBOSE to VERY_VERBOSE" - TEST_MESON_BUILD_VERY_VERBOSE=1 -fi -[ -n "$TEST_MESON_BUILD_VERBOSE" ] && exec 8>&1 || exec 8>/dev/null -verbose=8 -[ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] && exec 9>&1 || exec 9>/dev/null -veryverbose=9 - # shared and static linked builds with gcc and clang for c in gcc clang ; do command -v $c >/dev/null 2>&1 || continue -- 2.28.0