minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clang-format binary selection 

Also fix spaces to tabs
master
Loïc Blot 2017-04-06 10:01:09 +02:00
parent 4b15f76ed1
commit 48ce9c9b30
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
util/travis/lint.sh
View File

@ -1,46 +1,50 @@
#! /bin/bash #! /bin/bash
function perform_lint() { function perform_lint() {
echo "Performing LINT..." echo "Performing LINT..."
CLANG_FORMAT=clang-format if hash clang-format-3.9 2>/dev/null; then
CLANG_FORMAT_WHITELIST="util/travis/clang-format-whitelist.txt" CLANG_FORMAT=clang-format-3.9
else
CLANG_FORMAT=clang-format
fi
CLANG_FORMAT_WHITELIST="util/travis/clang-format-whitelist.txt"
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
# Get list of every file modified in this pull request # Get list of every file modified in this pull request
files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' | true)" files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' | true)"
else else
# Check everything for branch pushes # Check everything for branch pushes
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
fi fi
local errorcount=0 local errorcount=0
local fail=0 local fail=0
for f in ${files_to_lint}; do for f in ${files_to_lint}; do
d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true) d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true)
if ! [ -z "$d" ]; then if ! [ -z "$d" ]; then
whitelisted=$(egrep -c "^${f}" "${CLANG_FORMAT_WHITELIST}") whitelisted=$(egrep -c "^${f}" "${CLANG_FORMAT_WHITELIST}")
# If file is not whitelisted, mark a failure # If file is not whitelisted, mark a failure
if [ ${whitelisted} -eq 0 ]; then if [ ${whitelisted} -eq 0 ]; then
errorcount=$((errorcount+1)) errorcount=$((errorcount+1))
printf "The file %s is not compliant with the coding style" "$f" printf "The file %s is not compliant with the coding style" "$f"
if [ ${errorcount} -gt 50 ]; then if [ ${errorcount} -gt 50 ]; then
printf "\nToo many errors encountered previously, this diff is hidden.\n" printf "\nToo many errors encountered previously, this diff is hidden.\n"
else else
printf ":\n%s\n" "$d" printf ":\n%s\n" "$d"
fi fi
fail=1 fail=1
fi fi
fi fi
done done
if [ "$fail" = 1 ]; then if [ "$fail" = 1 ]; then
echo "LINT reports failure." echo "LINT reports failure."
exit 1 exit 1
fi fi
echo "LINT OK" echo "LINT OK"
} }