From 68751273944afe66e2c33de16febba2f435882fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Mon, 27 Feb 2023 01:01:24 +0100 Subject: [PATCH] Update Test coverage and build --- .github/workflows/build.yml | 4 +++- tests/test | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5fbfd8..2a1b05f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,10 +32,12 @@ jobs: build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build/ --config Release cd build ctest -C Release --output-on-failure + cd .. gcovr --root .. --gcov-filter "CPPFImdlp.cpp" --gcov-filter "Metrics.cpp" --txt --sonarqube=coverage.xml - name: Run sonar-scanner env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" + sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \ + --define sonar.coverageReportPaths=coverage.xml diff --git a/tests/test b/tests/test index fb44da9..ca7061f 100755 --- a/tests/test +++ b/tests/test @@ -6,11 +6,11 @@ cmake --build build cd build ctest --output-on-failure cd .. -if [ ! -d lcoverage ] ; then - mkdir lcoverage +if [ ! -d gcovr-report ] ; then + mkdir gcovr-report fi -rm -fr lcoverage/* 2>/dev/null +rm -fr gcovr-report/* 2>/dev/null #lcov --capture --directory ./ --output-file lcoverage/main_coverage.info #lcov --remove lcoverage/main_coverage.info 'v1/*' '/Applications/*' '*/tests/*' --output-file lcoverage/main_coverage.info -q #lcov --list lcoverage/main_coverage.info -gcovr --root .. --gcov-filter "CPPFImdlp.cpp" --gcov-filter "Metrics.cpp" --txt --sonarqube=coverage.xml +gcovr --root .. --gcov-filter "CPPFImdlp.cpp" --gcov-filter "Metrics.cpp" --txt --sonarqube=gcovr-report/coverage.xml