diff options
Diffstat (limited to 'extras/scripts/checkstyle.sh')
| -rwxr-xr-x | extras/scripts/checkstyle.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh index f8a83f3ec9d..2b884f5f08b 100755 --- a/extras/scripts/checkstyle.sh +++ b/extras/scripts/checkstyle.sh @@ -18,8 +18,14 @@ set -eEo pipefail CLANG_FORMAT_VER_REGEX='([0-9]+)\.[0-9]+\.[0-9]+' CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py" -CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-10} +# TODO: Remove clang-format-${CLANG_FORMAT_VER} from 'make install-deps' when +# CLANG_FORMAT_VER default value is upgraded +CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-11} GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1" +GIT_DIFF_EXCLUDE_LIST=( + ':!*.patch' + ':(exclude)*src/vppinfra/dlmalloc.*' +) CLANG_FORMAT_DIFF_ARGS="-style file -p1" SUFFIX="-${CLANG_FORMAT_VER}" @@ -58,9 +64,12 @@ fi if command -v clang-format-diff${SUFFIX} &> /dev/null; then CLANG_FORMAT_DIFF=clang-format-diff${SUFFIX} +elif command -v clang-format-diff.py &> /dev/null; +then + CLANG_FORMAT_DIFF=clang-format-diff.py elif command -v clang-format-diff &> /dev/null; then - CLANG_FORMAT=clang-format-diff + CLANG_FORMAT_DIFF=clang-format-diff elif [ ! -f $CLANG_FORMAT_DIFF ] ; then echo "*******************************************************************" @@ -71,7 +80,7 @@ then fi in=$(mktemp) -git diff ${GIT_DIFF_ARGS} ':!*.patch' > ${in} +git diff ${GIT_DIFF_ARGS} ${GIT_DIFF_EXCLUDE_LIST[@]} > ${in} line_count=$(sed -n '/^+.*\*INDENT-O[NF][F]\{0,1\}\*/p' ${in} | wc -l) if [ ${line_count} -gt 0 ] ; then |