diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-11 21:53:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-11 21:53:04 +0300 |
| commit | 8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471 (patch) | |
| tree | 35334434f931a50df1232771b49d54b04179193e /tools/ci/jobs | |
| parent | 71485eae058bab256770e90e5de196b3baf01cea (diff) | |
| download | ManaVerse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.tar.gz ManaVerse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.tar.bz2 ManaVerse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.tar.xz ManaVerse-8ca1f3d1666b8dc710af2b216c8ce71ecc2ac471.zip | |
Move doctest and catch files into unittests directory.
Diffstat (limited to 'tools/ci/jobs')
| -rwxr-xr-x | tools/ci/jobs/clang_tidy.sh | 4 | ||||
| -rwxr-xr-x | tools/ci/jobs/cpplint.sh | 3 | ||||
| -rwxr-xr-x | tools/ci/jobs/nsiqcppstyle.sh | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/ci/jobs/clang_tidy.sh b/tools/ci/jobs/clang_tidy.sh index ba8606641..8bc7786ab 100755 --- a/tools/ci/jobs/clang_tidy.sh +++ b/tools/ci/jobs/clang_tidy.sh @@ -18,8 +18,8 @@ check_error $? cd .. grep "warning:" logs/clang_tidy.txt \ -| grep -v "/src/test/doctest.h" \ -| grep -v "/src/test/catch.hpp" \ +| grep -v "/src/unittests/doctest.h" \ +| grep -v "/src/unittests/catch.hpp" \ | grep -v "/src/sdl2gfx/" \ | grep -v "/src/debug/" \ >${ERRFILE} diff --git a/tools/ci/jobs/cpplint.sh b/tools/ci/jobs/cpplint.sh index e9e286f23..4e9eab3c2 100755 --- a/tools/ci/jobs/cpplint.sh +++ b/tools/ci/jobs/cpplint.sh @@ -41,7 +41,8 @@ find src -type f -name "*.cc" -exec $CHECKER {} \; 2>>${ERRFILE}2 grep ": " ${ERRFILE}2 | \ grep -v "src/debug/" | \ -grep -v "test/doctest.h" | \ +grep -v "test/unittests/doctest.h" | \ +grep -v "test/unittests/catch.hpp" | \ grep -v "debug/fast_mutex" | \ grep -v "sdl2gfx/SDL2" \ >${ERRFILE} diff --git a/tools/ci/jobs/nsiqcppstyle.sh b/tools/ci/jobs/nsiqcppstyle.sh index 5e2785f54..7721398ec 100755 --- a/tools/ci/jobs/nsiqcppstyle.sh +++ b/tools/ci/jobs/nsiqcppstyle.sh @@ -9,6 +9,7 @@ rm -rf nsiqcppstyle.git ./nsiqcppstyle.git/nsiqcppstyle --ci --show-url src \ | grep -v "catch.hpp" \ +| grep -v "doctest.h" \ | grep -v "sdl2gfx" \ | grep -v "/debug/" \ >logs/nsiqcppstyle1.log |