diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | clang-tidy-diff.sh | 12 | ||||
| -rw-r--r-- | src/passes/pass.cpp | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9a837a75b..cfb381827 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,8 +60,7 @@ jobs: - set -o errexit - flake8 - ./clang-format-diff.sh - - which clang-tidy - - ls /usr/local/clang-5.0.0/share/clang/clang-tidy-diff.py + - ./clang-tidy-diff.sh # ensure generated parser is up to date - ./scripts/gen-s-parser.py | diff src/gen-s-parser.inc - - BUILD_SUBDIR=${BUILD_SUBDIR:-.} diff --git a/clang-tidy-diff.sh b/clang-tidy-diff.sh new file mode 100755 index 000000000..bd2cc8f9b --- /dev/null +++ b/clang-tidy-diff.sh @@ -0,0 +1,12 @@ +#!/bin/bash +CLANG_DIR=$(dirname $(dirname $(which clang-tidy))) +CLANG_TIDY_DIFF=$CLANG_DIR/share/clang/clang-tidy-diff.py +MERGE_BASE=$(git merge-base master HEAD) +TIDY_MSG=$(git diff -U0 $MERGE_BASE | $CLANG_TIDY_DIFF -quiet -p1 2> /dev/null) +if [ -n "$TIDY_MSG" -a "$TIDY_MSG" != "No relevant changes found." ] +then + echo "Run clang-tidy before committing!" + echo + # Run clang-tidy once again to show the error + git diff -U0 $MERGE_BASE | $CLANG_TIDY_DIFF -quiet -p1 +fi diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp index ae940a56d..ac6bc8361 100644 --- a/src/passes/pass.cpp +++ b/src/passes/pass.cpp @@ -698,6 +698,7 @@ void PassRunner::handleAfterEffects(Pass* pass, Function* func) { int PassRunner::getPassDebug() { static const int passDebug = getenv("BINARYEN_PASS_DEBUG") ? atoi(getenv("BINARYEN_PASS_DEBUG")) : 0; + int WrongStyleTestVar = 3; return passDebug; } |