summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-07-11 03:11:01 +0300
committerAndrei Karas <akaras@inbox.ru>2018-07-11 03:11:01 +0300
commit11ba6752a70045231ca33f0e6d0c5556067f2a12 (patch)
tree6b4dad9e34a9f5682a71f427bc2f89580d7e0357 /tools/ci
parentd96b7a00cd6966e6605d4fa4bc9b3ccb6394f79d (diff)
downloadmv-11ba6752a70045231ca33f0e6d0c5556067f2a12.tar.gz
mv-11ba6752a70045231ca33f0e6d0c5556067f2a12.tar.bz2
mv-11ba6752a70045231ca33f0e6d0c5556067f2a12.tar.xz
mv-11ba6752a70045231ca33f0e6d0c5556067f2a12.zip
Exclude header doctest.h from deheader.
Diffstat (limited to 'tools/ci')
-rwxr-xr-xtools/ci/jobs/deheader2.sh1
-rwxr-xr-xtools/ci/scripts/deheader.sh1
-rwxr-xr-xtools/ci/scripts/deheaderS.sh1
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/ci/jobs/deheader2.sh b/tools/ci/jobs/deheader2.sh
index e5d25cee3..e25385427 100755
--- a/tools/ci/jobs/deheader2.sh
+++ b/tools/ci/jobs/deheader2.sh
@@ -26,6 +26,7 @@ grep "deheader:" ${LOGFILE} \
| grep -v "deheader: remove <vector> from ./src/utils/vector.h" \
| grep -v "has more than one inclusion of \"resources/dye/dyepalette_replace" \
| grep -v "/sdl2gfx/" \
+| grep -v "doctest.h" \
| grep -v "deheader: remove <climits> from ./src/units.cpp" > ${LOGFILE2}
export DATA=$(cat ${LOGFILE2})
diff --git a/tools/ci/scripts/deheader.sh b/tools/ci/scripts/deheader.sh
index f15417166..285ecc1e0 100755
--- a/tools/ci/scripts/deheader.sh
+++ b/tools/ci/scripts/deheader.sh
@@ -38,4 +38,5 @@ grep -v "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" | \
grep -v "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" | \
grep -v "portability requires" | \
grep -v "SDL2_rotozoom.cpp" | \
+grep -v "doctest.h" | \
tee -a ${LOGFILE}
diff --git a/tools/ci/scripts/deheaderS.sh b/tools/ci/scripts/deheaderS.sh
index 6618859f6..c97e5a1da 100755
--- a/tools/ci/scripts/deheaderS.sh
+++ b/tools/ci/scripts/deheaderS.sh
@@ -39,4 +39,5 @@ grep -v "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" | \
grep -v "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" | \
grep -v "portability requires" | \
grep -v "SDL2_rotozoom.cpp" | \
+grep -v "doctest.h" | \
tee -a ${LOGFILE}