From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-f52.google.com (mail-ua1-f52.google.com [209.85.222.52]) by dpdk.org (Postfix) with ESMTP id 0557F1B5F6 for ; Tue, 18 Dec 2018 15:16:59 +0100 (CET) Received: by mail-ua1-f52.google.com with SMTP id e16so5743138uam.12 for ; Tue, 18 Dec 2018 06:16:59 -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=f2INxWEI2XMn/rI/c9Q1S+DEPIWshc7x6tl6jaei4z8=; b=lCElVURUv5JnnYmPXRl29hB5xwDUCguU/pPNtZc8Ww3WOtj/jKAheHgzCuqqXoHSqu Rq0YNdvHcZhiCQa6XVODyVjW+yPYeG6JCl4qx0JkJKpIqC/fvIimoX/xpcpzncb3iVz2 Q9pUBQ1VQq9L0B7wd+8rCWodDG0iiATpbUvNRQ5MT+fEIJkt3o7WmkHcqpBrD9LRAAj/ pSpORtcXWA/nFF/8CiR9DdOwp59dome3/TfIhfbGC90ask7cZwC7g+/MKLZCZ9xsWwWv QD/fQwSZMXoG092WKFy7Ye4MUfezpi/JcrnEAusUjpHXtCClI9X4wAZD3lMw2R90iggg tvWQ== X-Gm-Message-State: AA+aEWbuvEf7wfiF/tGSo4cvgZc505Tokcw/ey++V6sXZZd3aEpyNyzU Mu7sU6L59jSJdvbQ79APHi5CVnnjWjZLb4HEcEMB2Q== X-Google-Smtp-Source: AFSGD/V7QIgOgbNRFzlTUqxH7akzCAWYR+WS2zZ2LyCYaAyropPULdMH3qbn8cC7qJ43Ehsv9snWg7mT22xHB5DjzVM= X-Received: by 2002:ab0:4121:: with SMTP id j30mr7832924uad.65.1545142619218; Tue, 18 Dec 2018 06:16:59 -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:16: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:17:00 -0000 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. -- David Marchand