Fix check source error parsing

Change-Id: I1a1bb3333fb9a36083b72004e116467432319ae9

diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml
index b0a7be87b61e2b0a43e9d53ae7f1d60d1ecf9d35..d6a24c0f9123946b7192603bb561b7ba12f0113d 100644 (file)
--- a/admin/gitlab-ci/lint.gitlab-ci.yml
+++ b/admin/gitlab-ci/lint.gitlab-ci.yml
@@ -154,8 +154,10 @@ check-source:
     - cd $BUILD_DIR
     - cmake --build . --target check-source
     - awk '/warning.*include style.*order/,/You can use.*rst|^$/' docs/doxygen/check-source.log | tee doxygenError.txt || true
+    - awk '/warning:.*includes/,/unnecessarily|^$/' docs/doxygen/check-source.log | tee -a doxygenError.txt || true
     - awk '/Traceback/,/.*rror|^$/' docs/doxygen/doxygen*log docs/doxygen/check-source.log | tee -a doxygenError.txt || true
     - awk '/warning:/,/in doxygen.*|^$/' docs/doxygen/doxygen*log | tee -a doxygenError.txt || true
+    - grep -i "unused cycle suppression" docs/doxygen/check-source.log | tee -a doxygenError.txt || true
     - if [ -s doxygenError.txt ] ; then echo "Found errors while running doxygen"; exit 1; fi
   artifacts:
     name: docs-artifacts-$CI_COMMIT_REF_SLUG

diff --git a/docs/doxygen/cycle-suppressions.txt b/docs/doxygen/cycle-suppressions.txt
index d49152a172b9f04049128182eee6b24a4a71a7e2..b325f579673548e8688369b8224d0955cb9e0210 100644 (file)
--- a/docs/doxygen/cycle-suppressions.txt
+++ b/docs/doxygen/cycle-suppressions.txt
@@ -2,11 +2,6 @@
 # "moduleA -> moduleB" means that moduleA should not depend on moduleB, and is
 # a problem to be addressed at some point.
 
-# Compat wants assertions and string code from utility, and other string code
-# in utility wants to use string_view from compat. If we fix this, it might be
-# best to implement the compat namespace within the utility module.
-compat -> utility
-
 domdec -> imd
 domdec -> ewald
 domdec -> mdlib
@@ -29,4 +24,4 @@ modularsimulator -> mdrun
 
 # Cycle counters in timing use comrec for the set up, which is in the mdtypes. This introduces
 # cyclic dependencies if the cycle counting is used anywhere in mdtypes.
-timing -> mdtypes
\ No newline at end of file
+timing -> mdtypes

diff --git a/src/gromacs/compat/tests/pointers.cpp b/src/gromacs/compat/tests/pointers.cpp
index 991f9a31725e689a28a4897956fec54717f26c3e..4131ed28993f2bbb484b3f7844ca11bc2f03177e 100644 (file)
--- a/src/gromacs/compat/tests/pointers.cpp
+++ b/src/gromacs/compat/tests/pointers.cpp
@@ -42,8 +42,6 @@
 
 #include "gromacs/compat/pointers.h"
 
-#include "config.h"
-
 #include <memory>
 #include <vector>
 

diff --git a/src/gromacs/gmxpreprocess/tests/readir.cpp b/src/gromacs/gmxpreprocess/tests/readir.cpp
index 80e407451b48b9619c57df2afe6942f6606a6d1c..71771bcccb91c79a7cf599aaf7ca6b265e3a6c36 100644 (file)
--- a/src/gromacs/gmxpreprocess/tests/readir.cpp
+++ b/src/gromacs/gmxpreprocess/tests/readir.cpp
@@ -47,8 +47,6 @@
 
 #include "gromacs/gmxpreprocess/readir.h"
 
-#include "config.h"
-
 #include <string>
 
 #include <gtest/gtest.h>

diff --git a/src/gromacs/utility/tests/enumerationhelpers.cpp b/src/gromacs/utility/tests/enumerationhelpers.cpp
index 9d27cc96ac576972f4c90dba2c293503ae9d22d4..9f7da6257d29fe71765529e54c46c3c15522a247 100644 (file)
--- a/src/gromacs/utility/tests/enumerationhelpers.cpp
+++ b/src/gromacs/utility/tests/enumerationhelpers.cpp
@@ -42,8 +42,6 @@
 
 #include "gromacs/utility/enumerationhelpers.h"
 
-#include "config.h"
-
 #include <iostream>
 
 #include <gtest/gtest.h>

diff --git a/src/programs/mdrun/tests/densityfittingmodule.cpp b/src/programs/mdrun/tests/densityfittingmodule.cpp
index 7149eee08b3d87a291fdd7143e6900c34bcc08a2..ab7cc8798f04c283d435349198830bcaeef0314f 100644 (file)
--- a/src/programs/mdrun/tests/densityfittingmodule.cpp
+++ b/src/programs/mdrun/tests/densityfittingmodule.cpp
@@ -42,8 +42,6 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <string>
 
 #include <gmock/gmock.h>