From 8a398bbae279f07b1f9203721836b60dd1f39142 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 26 Sep 2017 02:39:40 +0200 Subject: checkstyle: ignore old clang-format (centos) Change-Id: Iecf35bd9fd760856e32eb1c0c9542ffbed472379 Signed-off-by: Klement Sekera --- build-root/scripts/checkstyle.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh index bd2ba81371b..6b760b3a440 100755 --- a/build-root/scripts/checkstyle.sh +++ b/build-root/scripts/checkstyle.sh @@ -40,12 +40,19 @@ indent --version # Check to make sure we have clang-format. Exit if we don't with an error message, but # don't *fail*. command -v clang-format > /dev/null +HAVE_CLANG_FORMAT=0 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} -- cgit 1.2.3-korg