From 9a99cde35a75663aecd70fac7a97eb4ed8ed020e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 15 Jun 2017 20:50:52 +0300 Subject: Add clang-tidy with sdl2 tests into .gitlab-ci.yml --- tools/ci/jobs/clang_tidy.sh | 6 +++--- tools/ci/scripts/clang_tidy.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/ci') 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} -- cgit v1.2.3-60-g2f50