From patchwork Fri Nov 2 06:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnon Warshavsky X-Patchwork-Id: 47705 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D82EC7CBC; Fri, 2 Nov 2018 07:00:13 +0100 (CET) Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id E580D7CB0 for ; Fri, 2 Nov 2018 07:00:11 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mta.qwilt.com (Postfix) with ESMTP id 3EBA78689EE; Fri, 2 Nov 2018 06:00:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at qwilt.com Received: from mta.qwilt.com ([127.0.0.1]) by localhost (mta.qwilt.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TTlYejeSpkBZ; Fri, 2 Nov 2018 06:00:11 +0000 (UTC) Received: from rd01.it.qwilt.com.qwilt.com (80.179.204.39.cable.012.net.il [80.179.204.39]) by mta.qwilt.com (Postfix) with ESMTPSA id B7FC98689E0; Fri, 2 Nov 2018 06:00:09 +0000 (UTC) From: Arnon Warshavsky To: thomas@monjalon.net, dev@dpdk.org, john.mcnamara@intel.com, marko.kovacevic@intel.com Cc: arnon@qwilt.com Date: Fri, 2 Nov 2018 08:00:05 +0200 Message-Id: <1541138405-6608-1-git-send-email-arnon@qwilt.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH v2] devtools: add explicit warning messages for forbidden tokens 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Replace the content of warning in the forbidden tokens script from using the searched regex into using explicit messages Signed-off-by: Arnon Warshavsky --- v2 - spelling typo devtools/check-forbidden-tokens.awk | 7 +------ devtools/checkpatches.sh | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk index fd77cdd..8c89de3 100755 --- a/devtools/check-forbidden-tokens.awk +++ b/devtools/check-forbidden-tokens.awk @@ -63,12 +63,7 @@ BEGIN { END { if (count > 0) { print "Warning in " substr(last_file,6) ":" - print "are you sure you want to add the following:" - for (key in expressions) { - if (expressions[key] > 0) { - print key - } - } + print MESSAGE exit RET_ON_FAIL } } diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index fb9e9f7..40f4c26 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -49,13 +49,16 @@ check_forbidden_additions() { # 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" # svg figures must be included with wildcard extension # because of png conversion for pdf docs + message="Using explicit .svg extension in figures instead of .*" awk -v FOLDERS='doc' \ -v EXPRESSIONS='::[[:space:]]*[^[:space:]]*\\.svg' \ -v RET_ON_FAIL=1 \ + -v MESSAGE="$message" \ -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \ "$1" }