aboutsummaryrefslogtreecommitdiffstats
path: root/build-root
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2020-12-12 19:09:31 +0100
committerDamjan Marion <damarion@cisco.com>2020-12-18 11:06:33 +0100
commit942542f7c1c3aae62a88612b8702a45f0d3b0e35 (patch)
tree6955c8198ccc33eb0e5b24c250853f6b27d29230 /build-root
parent44cae547370cc49fbc65127aad6d4f5211716383 (diff)
misc: migrate from GNU indent to clang-format
Type: make Change-Id: I085dcd6fe826da14d456f84a23355310bdc5d1e9 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-root')
-rwxr-xr-xbuild-root/scripts/checkstyle.sh155
1 files changed, 0 insertions, 155 deletions
diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh
deleted file mode 100755
index 58f67154114..00000000000
--- a/build-root/scripts/checkstyle.sh
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-VPP_DIR=`dirname $0`/../../
-EXIT_CODE=0
-FIX="0"
-FULL="0"
-CHECKSTYLED_FILES=""
-UNCHECKSTYLED_FILES=""
-
-# If the user provides --fix, then actually fix things
-# Note: this is meant for use outside of the CI Jobs, by users cleaning things up
-
-while true; do
- case ${1} in
- --fix)
- FIX="1"
- ;;
- --full)
- FULL="1"
- ;;
- esac
- shift || break
-done
-
-if [ "${FULL}" == "1" ]; then
- FILELIST=$(git ls-tree -r HEAD --name-only)
-else
- FILELIST=$((git diff HEAD~1.. --name-only; git ls-files -m ) | sort -u)
-fi
-
-# Check to make sure we have indent. Exit if we don't with an error message, but
-# don't *fail*.
-command -v indent > /dev/null
-if [ $? != 0 ]; then
- echo "Cound not find required command \"indent\". Checkstyle aborted"
- exit ${EXIT_CODE}
-fi
-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"
-else
- 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}
-git status
-for i in ${FILELIST}; do
- if [ -f ${i} ] && [ ${i} != "build-root/scripts/checkstyle.sh" ] && [ ${i} != "extras/emacs/fix-coding-style.el" ]; then
- grep -q '>>>>>>>' ${i}
- if [ $? == 0 ]; then
- echo "Unresolved merge conflict detected in" ${i} "... Abort."
- exit 1
- fi
- grep -q "fd.io coding-style-patch-verification: ON" ${i}
- if [ $? == 0 ]; then
- EXTENSION=`basename ${i} | sed 's/^\w\+.//'`
- case ${EXTENSION} in
- hpp|cpp|cc|hh)
- CMD="clang-format"
- if [ ${HAVE_CLANG_FORMAT} == 0 ]; then
- echo "C++ file detected. Abort. (missing clang-format)"
- exit ${EXIT_CODE}
- fi
- ;;
- *)
- CMD="indent"
- ;;
- esac
- CHECKSTYLED_FILES="${CHECKSTYLED_FILES} ${i}"
- if [ ${FIX} == 0 ]; then
- if [ "${CMD}" == "clang-format" ]
- then
- clang-format ${i} > ${i}.out2
- else
- indent ${i} -o ${i}.out1 > /dev/null 2>&1
- indent ${i}.out1 -o ${i}.out2 > /dev/null 2>&1
- fi
- # Remove trailing whitespace
- sed -i -e 's/[[:space:]]*$//' ${i}.out2
- diff -q ${i} ${i}.out2
- else
- if [ "${CMD}" == "clang-format" ]; then
- clang-format -i ${i} > /dev/null 2>&1
- else
- indent ${i}
- indent ${i}
- fi
- # Remove trailing whitespace
- sed -i -e 's/[[:space:]]*$//' ${i}
- fi
- if [ $? != 0 ]; then
- EXIT_CODE=1
- echo
- echo "Checkstyle failed for ${i}."
- if [ "${CMD}" == "clang-format" ]; then
- echo "Run clang-format as shown to fix the problem:"
- echo "clang-format -i ${VPP_DIR}${i}"
- else
- echo "Run indent (twice!) as shown to fix the problem:"
- echo "indent ${VPP_DIR}${i}"
- echo "indent ${VPP_DIR}${i}"
- fi
- fi
- if [ -f ${i}.out1 ]; then
- rm ${i}.out1
- fi
- if [ -f ${i}.out2 ]; then
- rm ${i}.out2
- fi
- else
- UNCHECKSTYLED_FILES="${UNCHECKSTYLED_FILES} ${i}"
- fi
- else
- UNCHECKSTYLED_FILES="${UNCHECKSTYLED_FILES} ${i}"
- fi
-done
-
-if [ ${EXIT_CODE} == 0 ]; then
- echo "*******************************************************************"
- echo "* VPP CHECKSTYLE SUCCESSFULLY COMPLETED"
- echo "*******************************************************************"
-else
- echo "*******************************************************************"
- echo "* VPP CHECKSTYLE FAILED"
- echo "* CONSULT FAILURE LOG ABOVE"
- echo "* NOTE: Running 'build-root/scripts/checkstyle.sh --fix' *MAY* fix the issue"
- echo "*******************************************************************"
-fi
-exit ${EXIT_CODE}