Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix clang-format binary selection
Also fix spaces to tabs
- Loading branch information
Showing
1 changed file
with
46 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,50 @@ | ||
#! /bin/bash | ||
function perform_lint() { | ||
echo "Performing LINT..." | ||
CLANG_FORMAT=clang-format | ||
CLANG_FORMAT_WHITELIST="util/travis/clang-format-whitelist.txt" | ||
|
||
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | ||
# 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)" | ||
else | ||
# Check everything for branch pushes | ||
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" | ||
fi | ||
|
||
local errorcount=0 | ||
local fail=0 | ||
for f in ${files_to_lint}; do | ||
d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true) | ||
|
||
if ! [ -z "$d" ]; then | ||
whitelisted=$(egrep -c "^${f}" "${CLANG_FORMAT_WHITELIST}") | ||
|
||
# If file is not whitelisted, mark a failure | ||
if [ ${whitelisted} -eq 0 ]; then | ||
errorcount=$((errorcount+1)) | ||
|
||
printf "The file %s is not compliant with the coding style" "$f" | ||
if [ ${errorcount} -gt 50 ]; then | ||
printf "\nToo many errors encountered previously, this diff is hidden.\n" | ||
else | ||
printf ":\n%s\n" "$d" | ||
fi | ||
|
||
fail=1 | ||
fi | ||
fi | ||
done | ||
|
||
if [ "$fail" = 1 ]; then | ||
echo "LINT reports failure." | ||
exit 1 | ||
fi | ||
|
||
echo "LINT OK" | ||
echo "Performing LINT..." | ||
if hash clang-format-3.9 2>/dev/null; then | ||
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 | ||
# 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)" | ||
else | ||
# Check everything for branch pushes | ||
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" | ||
fi | ||
|
||
local errorcount=0 | ||
local fail=0 | ||
for f in ${files_to_lint}; do | ||
d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true) | ||
|
||
if ! [ -z "$d" ]; then | ||
whitelisted=$(egrep -c "^${f}" "${CLANG_FORMAT_WHITELIST}") | ||
|
||
# If file is not whitelisted, mark a failure | ||
if [ ${whitelisted} -eq 0 ]; then | ||
errorcount=$((errorcount+1)) | ||
|
||
printf "The file %s is not compliant with the coding style" "$f" | ||
if [ ${errorcount} -gt 50 ]; then | ||
printf "\nToo many errors encountered previously, this diff is hidden.\n" | ||
else | ||
printf ":\n%s\n" "$d" | ||
fi | ||
|
||
fail=1 | ||
fi | ||
fi | ||
done | ||
|
||
if [ "$fail" = 1 ]; then | ||
echo "LINT reports failure." | ||
exit 1 | ||
fi | ||
|
||
echo "LINT OK" | ||
} | ||
|