Commit f8e54ea3 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

gcovr: remote pinning, use new fucntion merge method

parent a7f98742

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ fmt:coverage: 
        COMPILER_TYPE: "gcc"

    script:

        - export PATH=$PATH:~/.local/bin

        - pip install --trusted-host=pypi.org --user gcovr==5.0

        - pip install --trusted-host=pypi.org --user gcovr

        - export CCACHE_DIR=`pwd`/ccache

        - cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_ALL_MODULES=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON ..

        - ninja -k0

cmake/CodeCoverage.cmake

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE_GCOVR) 
        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}

        # Running gcovr

        COMMAND ${GCOVR_PATH} -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES} --object-directory=${PROJECT_BINARY_DIR}

                --merge-mode-functions=merge-use-line-min

        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}

        DEPENDS ${Coverage_DEPENDENCIES}

        COMMENT "Running gcovr to produce Cobertura code coverage report.")
@@ -208,6 +209,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML) 
        # Running gcovr

        COMMAND ${GCOVR_PATH} --html --html-details -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}

                --object-directory=${PROJECT_BINARY_DIR} -o ${Coverage_NAME}/index.html

                --merge-mode-functions=merge-use-line-min

        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}

        DEPENDS ${Coverage_DEPENDENCIES}

        COMMENT "Running gcovr to produce HTML code coverage report.")