diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-14 11:55:00 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-14 12:20:08 +0300 |
| commit | b00e6fc7e1ad56f2295aa819b9e7cb8abb2d5382 (patch) | |
| tree | 9e62031500c7d61831cb0233507f5137425afae7 | |
| parent | b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230 (diff) | |
| download | qtlocation-mapboxgl-b00e6fc7e1ad56f2295aa819b9e7cb8abb2d5382.tar.gz | |
[tidy] Install mason clang-tidy if CLANG_TIDY is not set
Also added HeaderFilterRegex to .clang-tidy.
| -rw-r--r-- | .clang-tidy | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | platform/osx/bitrise-tidy.yml | 1 | ||||
| -rwxr-xr-x | scripts/clang-tidy.sh | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.clang-tidy b/.clang-tidy index 17f2048f04..ebb5531ea6 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1 +1,2 @@ Checks: 'modernize-*,misc-static-assert,llvm-namespace-comment,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-core.uninitialized.UndefReturn' +HeaderFilterRegex: 'mbgl' @@ -306,10 +306,12 @@ compdb-macos: platform/macos/platform.gyp $(MACOS_OUTPUT_PATH)/config.gypi tidy: compdb tidy-$(HOST_PLATFORM) tidy-linux: + if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.8; fi deps/ninja/ninja-linux -C $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) headers scripts/clang-tidy.sh $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) tidy-macos: + if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.8; fi deps/ninja/ninja-macos -C $(MACOS_OUTPUT_PATH)/$(BUILDTYPE) headers scripts/clang-tidy.sh $(MACOS_OUTPUT_PATH)/$(BUILDTYPE) diff --git a/platform/osx/bitrise-tidy.yml b/platform/osx/bitrise-tidy.yml index ed4b6ab991..e159134c84 100644 --- a/platform/osx/bitrise-tidy.yml +++ b/platform/osx/bitrise-tidy.yml @@ -31,7 +31,6 @@ workflows: set -eu -o pipefail export BUILDTYPE=Release make compdb - .mason/mason install clang-tidy 3.8 make tidy - is_debug: 'no' - slack: diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh index cd61a5c48e..ad86ed3f12 100755 --- a/scripts/clang-tidy.sh +++ b/scripts/clang-tidy.sh @@ -18,7 +18,7 @@ command -v ${CLANG_TIDY} >/dev/null 2>&1 || { cd $1 function check_tidy() { - OUTPUT=$(${CLANG_TIDY} $0 -p=. -header-filter='mbgl' 2>/dev/null) + OUTPUT=$(${CLANG_TIDY} -p=$PWD $0 2>/dev/null) if [[ -n $OUTPUT ]]; then echo "Error: A clang-tidy warning/error happened:" echo -e "$OUTPUT" |