Update CSIT tests 171002 -> 171017

[vpp.git] / build-root / scripts / checkstyle.sh

diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh
index bd2ba81..f4ea79a 100755 (executable)
--- a/build-root/scripts/checkstyle.sh
+++ b/build-root/scripts/checkstyle.sh
@@ -39,13 +39,20 @@ indent --version
 
 # Check to make sure we have clang-format.  Exit if we don't with an error message, but
 # don't *fail*.
+HAVE_CLANG_FORMAT=0
 command -v clang-format > /dev/null
 if [ $? != 0 ]; then
     echo "Could not find command \"clang-format\". Checking C++ files will cause abort"
-    HAVE_CLANG_FORMAT=0
 else
-    HAVE_CLANG_FORMAT=1
     clang-format --version
+    x=$(echo "" | clang-format 2>&1)
+    if [[ "$x" == "" ]]; then
+        HAVE_CLANG_FORMAT=1
+    else
+       echo "Output produced while formatting empty file (expected empty string):"
+       echo "$x"
+        echo "Could not find working \"clang-format\". Checking C++ files will cause abort"
+    fi
 fi
 
 cd ${VPP_DIR}