From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) by dpdk.org (Postfix) with ESMTP id F25071BB20 for ; Tue, 18 Dec 2018 15:28:00 +0100 (CET) Received: by mail-vs1-f53.google.com with SMTP id x1so10075651vsc.10 for ; Tue, 18 Dec 2018 06:28:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vFVLRxDNLOhoz9Lh98hWVHHV5HC2UhGB3aHC3gKt4Q0=; b=KOqdYwsGwwWSrYWNqyKpT8Y9P8QRlxmBMQRpdRMfUAmmQuVLP8lVfT1N86vJApZU/f 3L14mIzfVjXgvFEBSM4tz8Sw9n3Zof4olrRXTSGW/xjzh5gEN5yuiTOFxgdA2UCqW6As wWqZ9pdPcc9r9MUL2GDgbhsG5R5RqNA6d4dorAcwWAnDop/DLDn0Ag4qbMLMpiJeF2D4 JyIgFj8YA87IZFD4/KecKd36T6qNohyHt82UPuLHqHvDqQyStSdA06RuGuI3ze2kVnfZ 2wosgIZjI8+zJ1VokcjrP83ldDCRe37b+G1ylxxkbXhWndJri0VCQhl5XIEL/S9ix/r0 u8Xg== X-Gm-Message-State: AA+aEWYu8ZADGnXyYYDCOYkyhJ+WaSK/B41eI64j+uNO9PHu3XwPs4em z2slposmtzSr/xtK4XRRXdCwT6Kz8kON8xCRBvqWzA== X-Google-Smtp-Source: AFSGD/WV17XRHzZ53F+Qe1jaLLSXkPybSlhdzSdA5or2/Nf5l2DG4GnUEYXypPGZZz/06492xwofOkNJEBkCXUr7UOc= X-Received: by 2002:a67:1b04:: with SMTP id b4mr8338770vsb.141.1545143280058; Tue, 18 Dec 2018 06:28:00 -0800 (PST) MIME-Version: 1.0 References: <1545141782-31841-1-git-send-email-arnon@qwilt.com> In-Reply-To: From: David Marchand Date: Tue, 18 Dec 2018 15:27:47 +0100 Message-ID: To: Arnon Warshavsky Cc: "Yigit, Ferruh" , ajit.khaparde@broadcom.com, thomasm@mellanox.com, dev@dpdk.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v1] devtools: fix error propagation from check-forbidden-tokens.awk 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: , X-List-Received-Date: Tue, 18 Dec 2018 14:28:01 -0000 On Tue, Dec 18, 2018 at 3:16 PM David Marchand wrote: > > > On Tue, Dec 18, 2018 at 3:12 PM David Marchand > wrote: > >> >> >> On Tue, Dec 18, 2018 at 3:03 PM Arnon Warshavsky wrote: >> >>> Bugzilla ID: 165 >>> Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides") >>> Signed-off-by: Arnon Warshavsky >>> >>> 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() { # >>> + 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() { # >> -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' \ >> > > Ah ok, nevermind, two issues. > Ok, second attempt, and this time tested :-) diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index ee8debe..915ef67 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -51,7 +51,7 @@ check_forbidden_additions() { # -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