From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, bruce.richardson@intel.com
Subject: [dpdk-dev] [PATCH 1/1] devtools: rename build test verbosity variables
Date: Thu, 12 Nov 2020 17:39:01 +0100 [thread overview]
Message-ID: <20201112163901.1728959-1-thomas@monjalon.net> (raw)
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 <thomas@monjalon.net>
---
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 () # <flag to check> <flag2> ...
{
echo 'int main(void) { return 0; }' |
@@ -108,11 +124,11 @@ config () # <dir> <builddir> <meson options>
compile () # <builddir>
{
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 () # <directory> <target compiler | cross file> <meson options>
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
next reply other threads:[~2020-11-12 16:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 16:39 Thomas Monjalon [this message]
2020-11-12 16:42 ` Bruce Richardson
2020-11-16 14:27 ` David Marchand
2020-11-16 14:44 ` Thomas Monjalon
2020-11-16 15:30 ` Bruce Richardson
2020-11-17 10:38 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
2020-11-18 10:56 ` David Marchand
2020-11-20 15:13 ` David Marchand
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=20201112163901.1728959-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
/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).