diff options
Diffstat (limited to 'scripts/run-analyzer.sh')
| -rwxr-xr-x | scripts/run-analyzer.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/run-analyzer.sh b/scripts/run-analyzer.sh index 4293883a1..9e53e50dd 100755 --- a/scripts/run-analyzer.sh +++ b/scripts/run-analyzer.sh @@ -45,19 +45,20 @@ LLVM_INSTALL_DIR=${LLVM_INSTALL_DIR:-""} # update-alternatives --install /usr/bin/run-clang-tidy.py run-clang-tidy.py /usr/bin/run-clang-tidy-4.0.py 1 CLANG_TIDY=`which clang-tidy` -RUN_CLANG_TIDY=`which run-clang-tidy.py` +RUN_CLANG_TIDY=`which run-clang-tidy` if [ -z "$RUN_CLANG_TIDY" ] || [ -z "$CLANG_TIDY" ]; then if [ ! -z "$LLVM_INSTALL_DIR" ]; then CLANG_TIDY="$LLVM_INSTALL_DIR/bin/clang-tidy" - RUN_CLANG_TIDY="$LLVM_INSTALL_DIR/share/clang/run-clang-tidy.py" + RUN_CLANG_TIDY="$LLVM_INSTALL_DIR/bin/run-clang-tidy" else echo "Can't find clang-tidy and/or run-clang-tidy.py in PATH, try setting LLVM_INSTALL_DIR" exit 1 fi fi -CPU_COUNT=$("$(dirname "$0")"/cpu-count.sh) +SCRIPT_DIR=$(dirname "$0") +CPU_COUNT=$("${SCRIPT_DIR}/cpu-count.sh") BUILD_OPTIONS="\ ${QBS_BUILD_PROFILE:+profile:${QBS_BUILD_PROFILE}} \ @@ -88,7 +89,7 @@ import os import sys dbFile = sys.argv[1] -blacklist = ['json.cpp', 'qmljsgrammar.cpp'] +blacklist = ['json.cpp', 'qmljsgrammar.cpp', 'qmljsparser.cpp'] seenFiles = set() patched_db = [] with open(dbFile, 'r') as f: |