X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fscripts%2Fcheckstyle.sh;h=f8a83f3ec9d864150f3fa181dc573a6f8f3b64be;hb=a7ec31750ca3d240adc3f6b3d9d189885b02d6df;hp=b40f43fa1e67a892fca800765332f983884b3d46;hpb=942542f7c1c3aae62a88612b8702a45f0d3b0e35;p=vpp.git

diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh
index b40f43fa1e6..f8a83f3ec9d 100755
--- a/extras/scripts/checkstyle.sh
+++ b/extras/scripts/checkstyle.sh
@@ -15,15 +15,63 @@
 
 set -eEo pipefail
 
-CLANG_FORMAT_VER=10
+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}
 GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1"
 CLANG_FORMAT_DIFF_ARGS="-style file -p1"
 SUFFIX="-${CLANG_FORMAT_VER}"
 
-clang-format${SUFFIX} --version
+# Attempt to find clang-format to confirm Clang version.
+if command -v clang-format${SUFFIX} &> /dev/null;
+then
+    CLANG_FORMAT=clang-format${SUFFIX}
+elif command -v clang-format &> /dev/null;
+then
+    CLANG_FORMAT=clang-format
+fi
+
+CLANG_FORMAT_VERSION=$(${CLANG_FORMAT} --version)
+echo $CLANG_FORMAT_VERSION
+
+# Confirm that Clang is the expected version.
+if [[ ! $CLANG_FORMAT_VERSION =~ $CLANG_FORMAT_VER_REGEX ]];
+then
+    echo "*******************************************************************"
+    echo "* CHECKSTYLE VERSION REGEX CHECK FAILED"
+    echo "* $CLANG_FORMAT_VERSION"
+    echo "*******************************************************************"
+    exit 1
+fi
+
+if [[ ! $CLANG_FORMAT_VER == "${BASH_REMATCH[1]}" ]];
+then
+    echo "*******************************************************************"
+    echo "* CHECKSTYLE VERSION CHECK FAILED"
+    echo "* Expected major version $CLANG_FORMAT_VER, found ${BASH_REMATCH[1]}"
+    echo "*******************************************************************"
+    exit 1
+fi
+
+# Attempt to find clang-format-diff.
+if command -v clang-format-diff${SUFFIX} &> /dev/null;
+then
+    CLANG_FORMAT_DIFF=clang-format-diff${SUFFIX}
+elif command -v clang-format-diff &> /dev/null;
+then
+    CLANG_FORMAT=clang-format-diff
+elif [ ! -f $CLANG_FORMAT_DIFF ] ;
+then
+    echo "*******************************************************************"
+    echo "* CHECKSTYLE FAILED"
+    echo "* Could not locate the clang-format-diff script"
+    echo "*******************************************************************"
+    exit 1
+fi
 
 in=$(mktemp)
-git diff ${GIT_DIFF_ARGS} > ${in}
+git diff ${GIT_DIFF_ARGS} ':!*.patch' > ${in}
 
 line_count=$(sed -n '/^+.*\*INDENT-O[NF][F]\{0,1\}\*/p' ${in} | wc -l)
 if [ ${line_count} -gt 0 ] ; then
@@ -39,7 +87,7 @@ if [ ${line_count} -gt 0 ] ; then
 fi
 
 if [ "${1}" == "--fix" ]; then
-  cat ${in} | clang-format-diff${SUFFIX} ${CLANG_FORMAT_DIFF_ARGS} -i
+  cat ${in} | ${CLANG_FORMAT_DIFF} ${CLANG_FORMAT_DIFF_ARGS} -i
   filelist=$(sed -n 's/^+++ b\/\(.*\.[ch]\)/\1/p' ${in})
   git status ${filelist}
   rm ${in}
@@ -61,7 +109,7 @@ fi
 
 out=$(mktemp)
 
-cat ${in} | clang-format-diff${SUFFIX} ${CLANG_FORMAT_DIFF_ARGS} > ${out}
+cat ${in} | ${CLANG_FORMAT_DIFF} ${CLANG_FORMAT_DIFF_ARGS} > ${out}
 rm ${in}
 
 line_count=$(cat ${out} | wc -l)