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 53882A059F; Fri, 10 Apr 2020 12:30:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5D8921C2AA; Fri, 10 Apr 2020 12:30:02 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 673561C238 for ; Fri, 10 Apr 2020 12:30:00 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 0B3125C01EA; Fri, 10 Apr 2020 06:29:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Fri, 10 Apr 2020 06:29:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=GKIe2IrzdP EOr4DxCdc5womuouH2eYc6ErJtwUi7bnQ=; b=RVaUTJmdIn0DF2unC1nuH7/iDd qY5Gc0dOYqXyYWHmHByMGilVW9i9mUssj7/hTZ08DYFqkumdCEBVmKKf0zHCkcNw L8x6O3YZ1dcI9vRPp6UbpTklPNpSp6Yf2Rkp1OEwHrzUS06VH0fsRo8qXNkCauB+ PeuqCqmoeIj7fRAkk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=GKIe2IrzdPEOr4DxCdc5womuouH2eYc6ErJtwUi7bnQ=; b=ubjSlEvP l7QD8hh7NqnYyN730rWvWrzuksTQ+LH4gubX2CCVs1BW5jbml/JxBqUmmf9rs5Oa x4LV0W6XUK9k0h1PYoa0R1LQcmvlUKxUjmF568QyoB6RCc6MTkAq7r2vK8XTHnxd 1Ye98jqBwLnWnG5vH3K1dgOmAi7A45roD4tFwPcHFr1IpPVrWMK1y8wC/PHlBvqu Q2h6O5X5W28ruzUypSrB1gKyWMM0J5vjn3D5WuzDWJNtXGvpmUKDo5rshGcnEC7W www8lp26zGckRjwkPPDgF1WzhrFa99V4PHG2rZdxzdlp1GCF1sIcFQhnI3qgPF+5 ekUWrYOY20WQCA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrvddvgddvlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph epjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth 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 52DC13060057; Fri, 10 Apr 2020 06:29:55 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: bruce.richardson@intel.com, Lukasz Wojciechowski , Aaron Conole , Ruifeng Wang , David Marchand , Gavin Hu Date: Fri, 10 Apr 2020 12:29:50 +0200 Message-Id: <20200410102951.1398001-1-thomas@monjalon.net> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200409180332.592074-1-thomas@monjalon.net> References: <20200409180332.592074-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3] test: remove meson dependency on /proc file 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" Meson is detecting the path /proc/sys/vm/nr_hugepages in the call to cat in app/test/meson.build and then adding it as a build dependency. This causes build loop if the timestamp of this file keeps changing. It is fixed by hiding hugepage check in a shell script. Fixes: 77784ef0fba8 ("test: allow no-huge mode for fast-tests") Signed-off-by: Thomas Monjalon Tested-by: Lukasz Wojciechowski Reviewed-by: Lukasz Wojciechowski Acked-by: Aaron Conole Reviewed-by: Ruifeng Wang --- v2: use variable as pointed by Lukasz v3: avoid TOCTOU issue as suggested by David I'm afraid it requires to re-confirm every reviews above. --- MAINTAINERS | 1 + app/test/has-hugepage.sh | 9 +++++++++ app/test/meson.build | 8 ++------ 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100755 app/test/has-hugepage.sh diff --git a/MAINTAINERS b/MAINTAINERS index 4800f6884a..aa619b6762 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1471,6 +1471,7 @@ F: app/test/Makefile F: app/test/autotest* F: app/test/commands.c F: app/test/get-coremask.sh +F: app/test/has-hugepage.sh F: app/test/packet_burst_generator.c F: app/test/packet_burst_generator.h F: app/test/process.h diff --git a/app/test/has-hugepage.sh b/app/test/has-hugepage.sh new file mode 100755 index 0000000000..865e66cddd --- /dev/null +++ b/app/test/has-hugepage.sh @@ -0,0 +1,9 @@ +#! /bin/sh +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2020 Mellanox Technologies, Ltd + +if [ "$(uname)" = "Linux" ] ; then + cat /proc/sys/vm/nr_hugepages || echo 0 +else + echo 0 +fi diff --git a/app/test/meson.build b/app/test/meson.build index 351d29cb65..542408d614 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -399,12 +399,8 @@ dpdk_test = executable('dpdk-test', has_hugepage = true if is_linux - check_hugepage = run_command('cat', - '/proc/sys/vm/nr_hugepages') - if (check_hugepage.returncode() != 0 or - check_hugepage.stdout().strip() == '0') - has_hugepage = false - endif + check_hugepage = find_program('has-hugepage.sh') + has_hugepage = run_command(check_hugepage).stdout().strip() != '0' endif message('hugepage availability: @0@'.format(has_hugepage)) -- 2.26.0