4 files changed, 9 insertions, 42 deletions
diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml
index 27ecc3655..021934447 100644
--- a/tools/ci/branches/ci_main1/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml
@@ -253,31 +253,3 @@ gcc-8_unsigned_char_sdl2:
               libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
               git gdb valgrind netcat-openbsd procps
     POST_CXXFLAGS: "-funsigned-char"
-
-gcc-8_password:
-  stage: build
-  script:
-  - ./tools/ci/scripts/patchsdl1.sh
-  - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword
-  - ./tools/ci/scripts/runtests.sh
-  <<: *job-push
-  variables:
-    PACKAGES: gcc-8 g++-8 
-              make autoconf automake autopoint gettext 
-              libxml2-dev libcurl4-gnutls-dev libpng-dev 
-              libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
-              git gdb valgrind netcat-openbsd procps
-
-gcc-8_password_sdl2:
-  stage: build
-  script:
-  - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword --with-sdl2
-  - ./tools/ci/scripts/runtests.sh
-  <<: *job-push
-  variables:
-    ABOUTYOFFSET: 380
-    PACKAGES: gcc-8 g++-8 
-              make autoconf automake autopoint gettext 
-              libxml2-dev libcurl4-gnutls-dev libpng-dev 
-              libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-              git gdb valgrind netcat-openbsd procps
diff --git a/tools/ci/jobs/cpplint.sh b/tools/ci/jobs/cpplint.sh
index d9ccf92c8..b8331ff29 100755
--- a/tools/ci/jobs/cpplint.sh
+++ b/tools/ci/jobs/cpplint.sh
@@ -50,21 +50,16 @@ args+=("--filter=\
 # Cannot find a good way to handle execution errors
 # (such cpplint.py demanding a version of Python that does not exist)
 # So use || true here and assume any other problems will be exposed
-# by the grep below.
+# by the grep below. Addendum: no more grep. YMMV.
 find src \
      -type f \
      \( -name "*.cc" \
-     -o -name "*.cpp"\
-     -o -name "*.h" \
-     -o -name "*.hpp" \
-     \) -exec ./cpplint.py --verbose=5 "${args[@]}" {} \+ 2>"$ERRFILE_UNFILTERED" \
-  || true
+     -o \( -name "*.cpp" -a \! -path src/debug/nvwa/debug_new.cpp \) \
+     -o \( -name "*.h"   -a \! -path src/unittests/doctest.h \) \
+     -o \( -name "*.hpp" -a \! -path src/unittests/catch.hpp \) \
+     \) -exec ./cpplint.py --verbose=5 "${args[@]}" {} \+ 2>"$ERRFILE"
+  #|| true
 
-# If grep does not find any messages, it exits non-zero. Therefore, use ||true
-grep -v -e "^src/debug/nvwa/debug_new.cpp" \
-        -e "^src/unittests/doctest.h" \
-        -e "^src/unittests/catch.hpp" \
-  < "$ERRFILE_UNFILTERED"  > "$ERRFILE"  || true
 
 
 run_check_warnings
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index cd716cf94..396dae182 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -223,7 +223,7 @@ function run_check_warnings {
     fi
 
     if [[ -s "$ERRFILE_UNFILTERED" ]]; then
-        printf "Warnings detected in %s. The maintainer might want take a peek, sometimes.\n" \
+        printf "Warnings detected in %s. The maintainer might want to take a peek, sometimes.\n" \
                "$ERRFILE_UNFILTERED"
     fi
 }
diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh
index 622e04da0..7b522b88a 100755
--- a/tools/ci/scripts/runtest.sh
+++ b/tools/ci/scripts/runtest.sh
@@ -52,7 +52,7 @@ function wait_for_servers_list {
 function run {
     ./src/manaplus --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 &
     export PID=$!
-    echo "manaplus PID: ${PID}"
+    echo "manaverse PID: ${PID}"
     sleep 15
     echo "pause after run"
     wait_for_servers_list
@@ -233,7 +233,7 @@ imagesdiff new_server.png about.png
 send_command "/sendmousekey 500 20 1"
 send_command "/screenshot about.png"
 
-# open about manaplus page
+# open about manaverse page
 send_command "/sendmousekey 300 ${ABOUTYOFFSET} 1"
 send_command "/screenshot about2.png"
 imagesdiff about.png about2.png