X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fscripts%2Fcheckstyle.sh;h=053342f87879a630a50e0847b89161c80d309e64;hb=4a332319cc09cd6fadf58c4cdbe941732b488b99;hp=4dcf77874d3ede70c996786d603c0d0c35dfb08b;hpb=fb1135da992ee6d578a8a1ad810217e0c7a0b457;p=vpp.git diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh index 4dcf77874d3..053342f8787 100755 --- a/extras/scripts/checkstyle.sh +++ b/extras/scripts/checkstyle.sh @@ -20,7 +20,7 @@ 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" CLANG_FORMAT_DIFF_ARGS="-style file -p1" SUFFIX="-${CLANG_FORMAT_VER}" @@ -60,9 +60,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 "*******************************************************************"