Update gitlab and docker file for coverage tests

.gitlab-ci.yml

@@ -404,17 +404,18 @@ build-gnu-gcov:
     - source cpp_sisso_gnu_gcov_env/bin/activate
     - export LD_LIBRARY_PATH=$HOME/intel/oneapi/intelpython/latest/lib/:$HOME/intel/oneapi/intelpython/latest/lib/python3.7:$LD_LIBRARY_PATH
     - export PYTHONPATH=$HOME/intel/oneapi/intelpython/latest/lib/python3.7/site-packages/:cpp_sisso_gnu_gcov_env/lib/python3.7/site-packages/
-    - mkdir build_param_py/
-    - cd build_param_py/
+    - mkdir build_gcov/
+    - cd build_gcov/
     - cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILE=gcc -DCMAKE_BUILD_TYPE="Coverage" -DBUILD_TESTS=ON -DBUILD_PARAMS=ON -DBUILD_PYTHON=ON  -DCMAKE_INSTALL_PREFIX=../gnu_gcov/ ../
     - make
-    - make install
+    - make coverage_xml
     - cd ../
+  coverage: /^\s*lines:\s*\d+.\d+\%/
   artifacts:
     when: always
-    paths:
-      - gnu_gcov/
-      - cpp_sisso_gnu_gcov_env/
+    name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+    reports:
+      cobertura: build_gcov/coverage_xml.xml
 
 pages:
   stage: doc_builds

CMakeLists.txt

@@ -477,7 +477,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Coverage")
     if(BUILD_TESTS)
         LIST(APPEND COV_DEPS "sisso_test")
     endif()
-
     string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "GNU" GNU_COMP)
     string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "Intel" INTEL_COMP)
 
@@ -489,13 +488,21 @@ if (CMAKE_BUILD_TYPE STREQUAL "Coverage")
         include(CodeCoverage)
 
         setup_target_for_coverage_lcov(
-            NAME coverage
+            NAME "coverage_html"
             EXECUTABLE make test
             DEPENDENCIES ${COV_DEPS}
             BASE_DIRECTORY "${CMAKE_SOURCE_DIR}/"
             EXCLUDE "CMakeCXXCompilerId.cpp" "/usr/*" "${PYTHON_INCLUDE_PATH}/*" "${MPI_CXX_INCLUDE_DIRS}/*" "src/utils/mkl_*" "*/external/*" "tests/*"
         )
+
+        setup_target_for_coverage_gcovr_xml(
+            NAME "coverage_xml"
+            EXECUTABLE make test
+            DEPENDENCIES ${COV_DEPS}
+            BASE_DIRECTORY "${CMAKE_SOURCE_DIR}/"
+            EXCLUDE "${CMAKE_BINARY_DIR}/CMakeFiles/${CMAKE_VERSION}/CompilerId*/*" "/usr/*" "${PYTHON_INCLUDE_PATH}/*" "${MPI_CXX_INCLUDE_DIRS}/*" "src/utils/mkl_*" "*/external/*" "tests/*"
+        )
     else()
-        MESSAGE(STATUS "Unable to build coverage target for the current compiler ${CMAKE_CXX_COMPILER_ID}")
+        message(STATUS "Unable to build coverage target for the current compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
 endif() #CMAKE_BUILD_TYPE STREQUAL "Coverage"

docker/Dockerfile

@@ -15,6 +15,7 @@ RUN apt-get update &&\
     apt-get install -y openssh-client openssh-server rsync &&\
     apt-get install -y openmpi-bin openmpi-common libopenmpi-dev &&\
     apt-get install -y doxygen &&\
+    apt-get install -y gcovr &&\
     apt-get clean
 
 RUN apt-get install -y gpg-agent wget software-properties-common &&\