From 11ba6752a70045231ca33f0e6d0c5556067f2a12 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 Jul 2018 03:11:01 +0300 Subject: Exclude header doctest.h from deheader. --- tools/ci/jobs/deheader2.sh | 1 + tools/ci/scripts/deheader.sh | 1 + tools/ci/scripts/deheaderS.sh | 1 + 3 files changed, 3 insertions(+) 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 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 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 from ./src/net/sdltcpnet.cpp" | \ grep -v "deheader: remove 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 from ./src/net/sdltcpnet.cpp" | \ grep -v "deheader: remove from ./src/resources/db/unitsdb.cpp" | \ grep -v "portability requires" | \ grep -v "SDL2_rotozoom.cpp" | \ +grep -v "doctest.h" | \ tee -a ${LOGFILE} -- cgit v1.2.3-70-g09d2