From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arnon Warshavsky <arnon@qwilt.com>
Subject: [PATCH v1] devtools: fix error propagation from
	check-forbidden-tokens.awk
Date: Tue, 18 Dec 2018 16:03:02 +0200
Message-ID: <1545141782-31841-1-git-send-email-arnon@qwilt.com>
Cc: dev@dpdk.org,
	arnon@qwilt.com
To: ferruh.yigit@intel.com, ajit.khaparde@broadcom.com, thomasm@mellanox.com
Return-path: <dev-bounces@dpdk.org>
Received: from mta.qwilt.com (unknown [52.9.191.255])
 by dpdk.org (Postfix) with ESMTP id 46CE71B5BA
 for <dev@dpdk.org>; Tue, 18 Dec 2018 15:03:10 +0100 (CET)
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Bugzilla ID: 165
Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides")
Signed-off-by: Arnon Warshavsky <arnon@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