diff options
| author | Loïc Blot <loic.blot@unix-experience.fr> | 2017-04-06 10:01:09 +0200 |
|---|---|---|
| committer | Loïc Blot <loic.blot@unix-experience.fr> | 2017-04-06 10:01:09 +0200 |
| commit | 48ce9c9b307ef340d21ecf00d623ac69cb841e09 (patch) | |
| tree | 1ddf5646b0ecaa26fd12b55d7def999e6e46a726 | |
| parent | 4b15f76ed163b1e0b95b50017bd39e73400601b4 (diff) | |
| download | minetest-48ce9c9b307ef340d21ecf00d623ac69cb841e09.tar.gz minetest-48ce9c9b307ef340d21ecf00d623ac69cb841e09.tar.bz2 minetest-48ce9c9b307ef340d21ecf00d623ac69cb841e09.zip | |
Fix clang-format binary selection
Also fix spaces to tabs
| -rw-r--r-- | util/travis/lint.sh | 88 |
1 files changed, 46 insertions, 42 deletions
diff --git a/util/travis/lint.sh b/util/travis/lint.sh index 96026b247..c1df2d5fa 100644 --- a/util/travis/lint.sh +++ b/util/travis/lint.sh @@ -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" } |