[dpdk-dev] [PATCH v1] devtools: fix error propagation from check-forbidden-tokens.awk

[David Marchand]

On Tue, Dec 18, 2018 at 3:03 PM Arnon Warshavsky <arnon at qwilt.com> wrote:

> Bugzilla ID: 165
> Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides")
> Signed-off-by: Arnon Warshavsky <arnon at qwilt.com>
>
> Explicitly collect the output and result of the
> multiple awk script calls, print and return error
> if any of them fails
> ---
>  devtools/checkpatches.sh | 21 +++++++++++++++++----
>  1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
> index ee8debe..df4336c 100755
> --- a/devtools/checkpatches.sh
> +++ b/devtools/checkpatches.sh
> @@ -44,22 +44,35 @@ print_usage () {
>  }
>
>  check_forbidden_additions() { # <patch>
> +       res=0
> +
>         # refrain from new additions of rte_panic() and rte_exit()
>         # multiple folders and expressions are separated by spaces
> -       awk -v FOLDERS="lib drivers" \
> +       result=$(awk -v FOLDERS="lib drivers" \
>                 -v EXPRESSIONS="rte_panic\\\( rte_exit\\\(" \
>                 -v RET_ON_FAIL=1 \
>                 -v MESSAGE='Using rte_panic/rte_exit' \
>                 -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk
> \
> -               "$1"
> +               "$1")
> +       if [ $? -ne 0 ] ; then
> +               echo $result
> +               res=1
> +       fi
> +
>         # svg figures must be included with wildcard extension
>         # because of png conversion for pdf docs
> -       awk -v FOLDERS='doc' \
> +       result=$(awk -v FOLDERS='doc' \
>                 -v EXPRESSIONS='::[[:space:]]*[^[:space:]]*\\.svg' \
>                 -v RET_ON_FAIL=1 \
>                 -v MESSAGE='Using explicit .svg extension instead of .*' \
>                 -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk
> \
> -               "$1"
> +               "$1")
> +        if [ $? -ne 0 ] ; then
> +                echo $result
> +                res=1
> +        fi
> +
> +       return $res
>  }
>
>  number=0
> --
> 1.8.3.1
>

How about just this change ?

diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index ee8debe..8385384 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -51,7 +51,7 @@ check_forbidden_additions() { # <patch>
                -v RET_ON_FAIL=1 \
                -v MESSAGE='Using rte_panic/rte_exit' \
                -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
-               "$1"
+               "$1" &&
        # svg figures must be included with wildcard extension
        # because of png conversion for pdf docs
        awk -v FOLDERS='doc' \

-- 
David Marchand