diff options
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/check-forbidden-tokens.awk | 7 | ||||
| -rwxr-xr-x | devtools/checkpatches.sh | 16 |
2 files changed, 14 insertions, 9 deletions
diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk index fd77cdd8..8c89de3d 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 bf3114f9..ee8debec 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -43,13 +43,23 @@ print_usage () { END_OF_HELP } -check_forbidden_additions() { +check_forbidden_additions() { # <patch> # refrain from new additions of rte_panic() and rte_exit() # multiple folders and expressions are separated by spaces awk -v FOLDERS="lib drivers" \ -v EXPRESSIONS="rte_panic\\\( rte_exit\\\(" \ -v RET_ON_FAIL=1 \ - -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk - + -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 + 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" } number=0 @@ -115,7 +125,7 @@ check () { # <patch> <commit> <title> fi ! $verbose || printf '\nChecking forbidden tokens additions:\n' - report=$(check_forbidden_additions <"$tmpinput") + report=$(check_forbidden_additions "$tmpinput") if [ $? -ne 0 ] ; then $headline_printed || print_headline "$3" printf '%s\n' "$report" |