summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-15 20:50:52 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-15 22:14:33 +0300
commit9a99cde35a75663aecd70fac7a97eb4ed8ed020e (patch)
tree8394b528f860fe894640d43307ce3927656348a5
parentf6cb5519a2cc4452055ff0bfb6f38990bc3e9e65 (diff)
downloadmv-9a99cde35a75663aecd70fac7a97eb4ed8ed020e.tar.gz
mv-9a99cde35a75663aecd70fac7a97eb4ed8ed020e.tar.bz2
mv-9a99cde35a75663aecd70fac7a97eb4ed8ed020e.tar.xz
mv-9a99cde35a75663aecd70fac7a97eb4ed8ed020e.zip
Add clang-tidy with sdl2 tests into .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml17
-rwxr-xr-xtools/ci/jobs/clang_tidy.sh6
-rwxr-xr-xtools/ci/scripts/clang_tidy.sh2
3 files changed, 21 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 573499005..9d8176991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2821,6 +2821,23 @@ clang-tidy:
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
FLAGS: "-readability-implicit-bool-cast,-clang-analyzer-optin.cplusplus.VirtualCall,-performance-unnecessary-value-param,-misc-unused-parameters,-modernize-use-default,-clang-analyzer-alpha.deadcode.UnreachableCode,-clang-analyzer-alpha.cplusplus.VirtualCall,-clang-analyzer-alpha.unix.Stream,-clang-analyzer-alpha.security.taint.TaintPropagation,-clang-analyzer-alpha.core.CastToStruct,-clang-analyzer-alpha.core.BoolAssignment"
+ DFLAGS: "-DENABLE_LIBXML -DTMWA_SUPPORT -DDEBUGBUILD"
+ INCLUDES: "-I/usr/include -I/usr/include/SDL -I/usr/include/libxml2"
+ tags:
+ - docker
+
+clang-tidy_sdl2:
+ stage: build
+ script:
+ - ./tools/ci/jobs/clang_tidy.sh
+ <<: *job-push
+ variables:
+ PACKAGES: clang clang-tidy
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+ FLAGS: "-readability-implicit-bool-cast,-clang-analyzer-optin.cplusplus.VirtualCall,-performance-unnecessary-value-param,-misc-unused-parameters,-modernize-use-default,-clang-analyzer-alpha.deadcode.UnreachableCode,-clang-analyzer-alpha.cplusplus.VirtualCall,-clang-analyzer-alpha.unix.Stream,-clang-analyzer-alpha.security.taint.TaintPropagation,-clang-analyzer-alpha.core.CastToStruct,-clang-analyzer-alpha.core.BoolAssignment,-cppcoreguidelines-pro-type-cstyle-cast"
+ DFLAGS: "-DENABLE_LIBXML -DTMWA_SUPPORT -DDEBUGBUILD -DUSE_SDL2"
+ INCLUDES: "-I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
tags:
- docker
diff --git a/tools/ci/jobs/clang_tidy.sh b/tools/ci/jobs/clang_tidy.sh
index 593d986f4..10765efc3 100755
--- a/tools/ci/jobs/clang_tidy.sh
+++ b/tools/ci/jobs/clang_tidy.sh
@@ -8,11 +8,11 @@ rm "logs/clang_tidy.txt"
cd src
-find . -type f -name "*.cpp" -exec ../tools/ci/scripts/clang_tidy.sh "${FLAGS}" "" {} \; >>../logs/clang_tidy.txt
+find . -type f -name "*.cpp" -exec ../tools/ci/scripts/clang_tidy.sh "${FLAGS}" "${DFLAGS}" {} \; >>../logs/clang_tidy.txt
check_error $?
-find . -type f -name "*.cc" -exec ../tools/ci/scripts/clang_tidy.sh "${FLAGS}" "-DUNITTESTS -DUNITTESTS_CATCH" {} \; >>../logs/clang_tidy.txt
+find . -type f -name "*.cc" -exec ../tools/ci/scripts/clang_tidy.sh "${FLAGS}" "-DUNITTESTS -DUNITTESTS_CATCH ${DFLAGS}" {} \; >>../logs/clang_tidy.txt
check_error $?
-find . -type f -name "*.h" -exec ../tools/ci/scripts/clang_tidy.sh "${FLAGS}" "" {} \; >>../logs/clang_tidy.txt
+find . -type f -name "*.h" -exec ../tools/ci/scripts/clang_tidy.sh "${FLAGS}" "${DFLAGS}" {} \; >>../logs/clang_tidy.txt
check_error $?
cd ..
diff --git a/tools/ci/scripts/clang_tidy.sh b/tools/ci/scripts/clang_tidy.sh
index 56761379a..1f1266f9d 100755
--- a/tools/ci/scripts/clang_tidy.sh
+++ b/tools/ci/scripts/clang_tidy.sh
@@ -2,4 +2,4 @@
dir=`pwd`
-clang-tidy -checks="$1" "$3" -- -std=c++11 -x c++ -DENABLE_LIBXML -DTMWA_SUPPORT -DDEBUGBUILD $2 -I$dir -I/usr/include -I/usr/include/SDL -I/usr/include/libxml2
+clang-tidy -checks="$1" "$3" -- -std=c++11 -x c++ $2 -I$dir ${INCLUDES}