From: David Marchand <david.marchand@redhat.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: dev <dev@dpdk.org>, Bruce Richardson <bruce.richardson@intel.com>
Subject: Re: [dpdk-dev] [PATCH v2 1/1] devtools: rename build test verbosity variables
Date: Wed, 18 Nov 2020 11:56:41 +0100 [thread overview]
Message-ID: <CAJFAV8yERj0nMHB=U2J=O5DZB5u8nRuK0V+KOKXKWc=7Ciz4Vw@mail.gmail.com> (raw)
In-Reply-To: <20201117103826.585604-1-thomas@monjalon.net>
On Tue, Nov 17, 2020 at 11:38 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The verbosity was meant to be set with options -v and -vv,
> or possibly with the environment variables TEST_MESON_BUILD_VERBOSE
> and TEST_MESON_BUILD_VERY_VERBOSE.
>
> It is decided to keep only the options -v and -vv,
> so the variables are renamed with lower case, marking them as privates.
>
> 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>
> ---
> v2: make the variables private to the script
> ---
> devtools/test-meson-builds.sh | 38 ++++++++++++++++++-----------------
> 1 file changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
> index 3ce49368cf..7280b7a93d 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -43,6 +43,24 @@ default_cflags=$CFLAGS
> default_ldflags=$LDFLAGS
> default_meson_options=$DPDK_MESON_OPTIONS
>
> +opt_verbose=
> +opt_vverbose=
> +if [ "$1" = "-v" ] ; then
> + opt_verbose=y
> +elif [ "$1" = "-vv" ] ; then
> + opt_verbose=y
> + opt_vverbose=y
> +fi
> +# we can't use plain verbose when we don't have pipefail option so up-level
> +if [ -z "$PIPEFAIL" -a -n "$opt_verbose" ] ; then
> + echo "# Missing pipefail shell option, changing VERBOSE to VERY_VERBOSE"
> + opt_vverbose=y
> +fi
> +[ -n "$opt_verbose" ] && exec 8>&1 || exec 8>/dev/null
> +verbose=8
> +[ -n "$opt_vverbose" ] && exec 9>&1 || exec 9>/dev/null
> +veryverbose=9
> +
> check_cc_flags () # <flag to check> <flag2> ...
> {
> echo 'int main(void) { return 0; }' |
> @@ -108,11 +126,11 @@ config () # <dir> <builddir> <meson options>
> compile () # <builddir>
> {
> builddir=$1
> - if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
> + if [ -n "$opt_vverbose" ] ; 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 "$opt_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 +198,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
>
Reviewed-by: David Marchand <david.marchand@redhat.com>
--
David Marchand
next prev parent reply other threads:[~2020-11-18 10:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 16:39 [dpdk-dev] [PATCH " Thomas Monjalon
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 [this message]
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='CAJFAV8yERj0nMHB=U2J=O5DZB5u8nRuK0V+KOKXKWc=7Ciz4Vw@mail.gmail.com' \
--to=david.marchand@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/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).