summaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorThomas Monjalon <thomas@monjalon.net>2018-10-01 22:38:13 +0200
committerThomas Monjalon <thomas@monjalon.net>2018-10-01 23:46:50 +0200
commit8f3ea0a03dce3d42f83915201395605d4b63d347 (patch)
treeb2d27ee6e7499bc465168a8aaa3e246164d80057 /devtools
parent42f4d724ec27ffb4f512713cfb83cfc645086571 (diff)
downloaddpdk-8f3ea0a03dce3d42f83915201395605d4b63d347.zip
dpdk-8f3ea0a03dce3d42f83915201395605d4b63d347.tar.gz
dpdk-8f3ea0a03dce3d42f83915201395605d4b63d347.tar.xz
devtools: fix printing subject of checked patch
If checkpatches.sh is not run with verbose option (-v), the patch subject is printed as headline of errors only if there is an error reported by checkpatch.pl, not with other checks. The headline is moved to a function which is called after each check if there is an error and if it has not already be printed. One more addition, in verbose mode, checkpatch.pl is now announced as done for other checks. Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Acked-by: Neil Horman <nhorman@tuxdriver.com>
Diffstat (limited to 'devtools')
-rwxr-xr-xdevtools/checkpatches.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 18e474f..dbed422 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -73,14 +73,20 @@ if [ ! -f "$DPDK_CHECKPATCH_PATH" ] || [ ! -x "$DPDK_CHECKPATCH_PATH" ] ; then
exit 1
fi
+print_headline() { # <title>
+ printf '\n### %s\n\n' "$1"
+ headline_printed=true
+}
+
total=0
status=0
check () { # <patch> <commit> <title>
local ret=0
+ headline_printed=false
total=$(($total + 1))
- ! $verbose || printf '\n### %s\n\n' "$3"
+ ! $verbose || print_headline "$3"
if [ -n "$1" ] ; then
tmpinput=$1
elif [ -n "$2" ] ; then
@@ -92,9 +98,10 @@ check () { # <patch> <commit> <title>
cat > "$tmpinput"
fi
+ ! $verbose || printf 'Running checkpatch.pl:\n'
report=$($DPDK_CHECKPATCH_PATH $options "$tmpinput" 2>/dev/null)
if [ $? -ne 0 ] ; then
- $verbose || printf '\n### %s\n\n' "$3"
+ $headline_printed || print_headline "$3"
printf '%s\n' "$report" | sed -n '1,/^total:.*lines checked$/p'
ret=1
fi
@@ -102,6 +109,7 @@ check () { # <patch> <commit> <title>
! $verbose || printf '\nChecking API additions/removals:\n'
report=$($VALIDATE_NEW_API "$tmpinput")
if [ $? -ne 0 ] ; then
+ $headline_printed || print_headline "$3"
printf '%s\n' "$report"
ret=1
fi
@@ -109,6 +117,7 @@ check () { # <patch> <commit> <title>
! $verbose || printf '\nChecking forbidden tokens additions:\n'
report=$(check_forbidden_additions <"$tmpinput")
if [ $? -ne 0 ] ; then
+ $headline_printed || print_headline "$3"
printf '%s\n' "$report"
ret=1
fi