summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
Diffstat (limited to 'tools/ci')
-rwxr-xr-xtools/ci/jobs/clang_tidy.sh4
-rwxr-xr-xtools/ci/jobs/cpplint.sh3
-rwxr-xr-xtools/ci/jobs/nsiqcppstyle.sh1
-rwxr-xr-xtools/ci/scripts/init.sh3
4 files changed, 7 insertions, 4 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
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index 0ef5c219e..f435eed99 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -280,7 +280,8 @@ function run_mplint {
rm $ERRFILE
echo "mplint/src/mplint $*"
mplint/src/mplint $* \
- | grep -v "src/test/doctest.h" \
+ | grep -v "src/unittests/doctest.h" \
+ | grep -v "src/unittests/catch.hpp" \
| grep -v "src/debug/" \
>$ERRFILE
run_check_warnings