aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2020-02-19 21:02:51 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2020-02-21 19:34:18 +0000
commit9a84e6931d64a153b5c6f605d1d2555abf91592d (patch)
treeb53e66bcd2c9ab82cf9d570fe8247636fb0d1d14 /scripts
parent8c300ef4c78e8bd759e0b6f0cabe07cb12c708e3 (diff)
Use python3 in Travis for building docs and running clang-tidy
Change-Id: I2f0d72abdf12a4e64b79bf9a3c02b32cf4cbeed6 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/run-analyzer.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/run-analyzer.sh b/scripts/run-analyzer.sh
index 8d45cc9f5..926e3453f 100755
--- a/scripts/run-analyzer.sh
+++ b/scripts/run-analyzer.sh
@@ -93,12 +93,11 @@ qbs generate -g clangdb -f "$QBS_SRC_DIR/qbs.qbs" $BUILD_OPTIONS
SCRIPT="
import json
import os
-import sets
import sys
dbFile = sys.argv[1]
blacklist = ['json.cpp']
-seenFiles = sets.Set()
+seenFiles = set()
patched_db = []
with open(dbFile, 'r') as f:
db = json.load(f)
@@ -111,7 +110,7 @@ with open(dbFile, 'r') as f:
with open(dbFile, 'w') as f:
f.write(json.dumps(patched_db, indent=2))
"
-python -c "${SCRIPT}" analyzer/compile_commands.json
+python3 -c "${SCRIPT}" analyzer/compile_commands.json
RUN_CLANG_TIDY+=" -p analyzer -clang-tidy-binary ${CLANG_TIDY} -j ${CPU_COUNT} -header-filter=\".*qbs.*\.h$\" -quiet"
${RUN_CLANG_TIDY} 2>/dev/null | tee results.txt