X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fscripts%2Fcheckstyle.sh;h=2b884f5f08b2f9699d92f2c529de9f7ced0d3a6e;hb=5d0fa2f85c155039fcca97a0872c138400ee134c;hp=4dcf77874d3ede70c996786d603c0d0c35dfb08b;hpb=fb1135da992ee6d578a8a1ad810217e0c7a0b457;p=vpp.git

diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh
index 4dcf77874d3..2b884f5f08b 100755
--- a/extras/scripts/checkstyle.sh
+++ b/extras/scripts/checkstyle.sh
@@ -20,8 +20,12 @@ CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py"
 
 # 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:-10}
+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}"
 
@@ -60,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 "*******************************************************************"
@@ -73,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