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 A1E07A0597; Thu, 9 Apr 2020 20:04:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9CAAA1C134; Thu, 9 Apr 2020 20:04:15 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 33A4A1C0AE for ; Thu, 9 Apr 2020 20:04:14 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 82E3B5C2884; Thu, 9 Apr 2020 14:04:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 09 Apr 2020 14:04:10 -0400 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=mesmtp; bh=CsaOtCwy5i2m04mfRfbB7R6 FWHr9CJ7PW724M56bcvg=; b=Vo0vit/2i3gcsJIPc66VNK/BZrMeL9clXtaemBE JMkrOON6UwGMPCzx4JGyB6sSs3vxm6nKsl9hDg6DmTleWtuz/4ZbarNGRryds3hF wmIDIWCvUT1NNvdj7hpuKyW7ic2Mf/yoxFDXKXsJ22wPbHDWzIkHxGV/JKlxi+Op B/J0= 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=fm2; bh=CsaOtCwy5i2m04mfR fbB7R6FWHr9CJ7PW724M56bcvg=; b=kmySWOOCSFg+XZePN4S0ir0/0praV8e4S r0rcaUqQfeHcFuhfZjcgUmgxMX4jCSXNLssHYpCKSMmmL7Gpwjrzyk06ib6XlF0J 3Eqo6AuYHQFqdBmabKTAMS6sxVeCcuA1WJooM+G97EAI7+8Rn/NyVc29kevjuUsk R5KJVQ1hKUxD0/gUECf9J3bgum7QgemOdmIRbJpq2mISv3z2d3VnYesAahNxm9NV C+tNn8CM60zpADMmz0o8i7OjcHy4p8hDyw1u7qsD9Z4WIKSk4AQzJds6N5Nd6nhK 3VIeQYX+YMWXC/FqlScvhHyWyuJiJ20XTlQ9AjiBM9aF4ixqGI8Fw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudelgdduudegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecukfhppe ejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght 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 0B1613060067; Thu, 9 Apr 2020 14:04:08 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: bruce.richardson@intel.com, Ruifeng Wang , Gavin Hu , Aaron Conole , David Marchand Date: Thu, 9 Apr 2020 20:03:32 +0200 Message-Id: <20200409180332.592074-1-thomas@monjalon.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] 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 --- MAINTAINERS | 1 + app/test/has-hugepage.sh | 11 +++++++++++ app/test/meson.build | 8 ++------ 3 files changed, 14 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..484fc5541f --- /dev/null +++ b/app/test/has-hugepage.sh @@ -0,0 +1,11 @@ +#! /bin/sh -e +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2020 Mellanox Technologies, Ltd + +linux_hugepages_number=/proc/sys/vm/nr_hugepages + +if [ -r "$linux_hugepages_number" ] ; then + cat /proc/sys/vm/nr_hugepages +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