From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com,
Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>,
Aaron Conole <aconole@redhat.com>,
Ruifeng Wang <ruifeng.wang@arm.com>,
David Marchand <david.marchand@redhat.com>,
Gavin Hu <gavin.hu@arm.com>
Subject: [dpdk-dev] [PATCH v4] test: remove meson dependency on /proc file
Date: Wed, 15 Apr 2020 15:19:54 +0200 [thread overview]
Message-ID: <20200415131954.2006010-1-thomas@monjalon.net> (raw)
In-Reply-To: <20200409180332.592074-1-thomas@monjalon.net>
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 <thomas@monjalon.net>
Tested-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Reviewed-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
v2: use variable as pointed by Lukasz
v3: avoid TOCTOU issue as suggested by David
v4: remove Linux check in meson file and skip find_program() call
---
MAINTAINERS | 1 +
app/test/has-hugepage.sh | 9 +++++++++
app/test/meson.build | 10 +---------
3 files changed, 11 insertions(+), 9 deletions(-)
create mode 100755 app/test/has-hugepage.sh
diff --git a/MAINTAINERS b/MAINTAINERS
index 144cf5d8ea..fe59f0224f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1469,6 +1469,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 777c536ae0..04b59cffa4 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -396,15 +396,7 @@ dpdk_test = executable('dpdk-test',
install_rpath: driver_install_path,
install: true)
-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
-endif
+has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
message('hugepage availability: @0@'.format(has_hugepage))
# some perf tests (eg: memcpy perf autotest)take very long
--
2.26.0
next prev parent reply other threads:[~2020-04-15 13:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200409180425eucas1p207746156e52ec225d173466de7bee9f4@eucas1p2.samsung.com>
2020-04-09 18:03 ` [dpdk-dev] [PATCH] " Thomas Monjalon
2020-04-09 18:10 ` Lukasz Wojciechowski
2020-04-09 19:24 ` Thomas Monjalon
2020-04-09 18:58 ` Lukasz Wojciechowski
2020-04-09 19:34 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2020-04-09 19:52 ` Lukasz Wojciechowski
2020-04-09 19:57 ` Aaron Conole
2020-04-10 1:14 ` Ruifeng Wang
2020-04-10 10:29 ` [dpdk-dev] [PATCH v3] " Thomas Monjalon
2020-04-10 10:42 ` Bruce Richardson
2020-04-10 12:27 ` Thomas Monjalon
2020-04-10 13:25 ` Bruce Richardson
2020-04-10 14:41 ` Thomas Monjalon
2020-04-10 20:47 ` Lukasz Wojciechowski
2020-04-10 22:22 ` Stephen Hemminger
2020-04-15 13:14 ` Thomas Monjalon
2020-04-10 14:05 ` Aaron Conole
2020-04-15 13:19 ` Thomas Monjalon [this message]
2020-04-15 13:28 ` [dpdk-dev] [PATCH v4] " Richardson, Bruce
2020-04-15 13:30 ` Thomas Monjalon
2020-04-15 13:36 ` David Marchand
2020-04-15 13:40 ` Thomas Monjalon
2020-04-15 13:49 ` David Marchand
2020-04-15 13:56 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415131954.2006010-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=aconole@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=gavin.hu@arm.com \
--cc=l.wojciechow@partner.samsung.com \
--cc=ruifeng.wang@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).