From 3ed696ac8e3c45509508b81ecd1888a214584691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Thu, 27 Jan 2022 15:21:02 +0100
Subject: [PATCH] upgrade coverage scripts

---
 .../workflows/on_PR_linux_special_builds.yml  | 23 +++++++++++++++----
 cmake/gcovr.cmake                             |  1 +
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml
index ddb7243c..092f8a4d 100644
--- a/.github/workflows/on_PR_linux_special_builds.yml
+++ b/.github/workflows/on_PR_linux_special_builds.yml
@@ -17,6 +17,7 @@ jobs:
         run: |
           sudo apt-get install ninja-build
           pip3 install conan==1.43.0
+          pip3 install gcovr
 
       - name: Conan common config
         run: |
@@ -32,16 +33,27 @@ jobs:
 
       - name: Build
         run: |
-          cd build
-          cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DBUILD_WITH_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=install ..
+          cd build && \
+          cmake -GNinja \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DBUILD_SHARED_LIBS=ON \
+            -DEXIV2_ENABLE_PNG=ON \
+            -DEXIV2_ENABLE_WEBREADY=ON \
+            -DEXIV2_ENABLE_CURL=ON \
+            -DEXIV2_BUILD_UNIT_TESTS=ON \
+            -DEXIV2_ENABLE_BMFF=ON \
+            -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON \
+            -DEXIV2_BUILD_SAMPLES=ON \
+            -DBUILD_WITH_COVERAGE=ON \
+            -DCMAKE_INSTALL_PREFIX=install \
+            .. && \
           cmake --build .
 
       - name: Tests + Upload coverage
         run: |
           cd build
           ctest --output-on-failure
-          pip install gcovr
-          gcovr -r ./../ -x --exclude-unreachable-branches --exclude-throw-branches -o coverage.xml .
+          gcovr --root .. --object-dir . --exclude-directories xmpsdk --exclude-directories unitTests --exclude-directories samples --exclude '.*xmpsdk.*' --exclude '.*unitTests.*' --exclude '.*samples.*' --exclude-unreachable-branches --exclude-throw-branches --xml -o coverage.xml
           curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --import
           curl -Os https://uploader.codecov.io/latest/linux/codecov
           curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
@@ -49,7 +61,8 @@ jobs:
           gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM
           shasum -a 256 -c codecov.SHA256SUM
           chmod +x codecov
-          ./codecov -f build/coverage.xml
+          ls -lh
+          ./codecov -f coverage.xml
 
   special_releaseValgrind:
     name: 'Ubuntu 20.04 - GCC - Release+Valgrind'
diff --git a/cmake/gcovr.cmake b/cmake/gcovr.cmake
index ad069563..75d16e8a 100644
--- a/cmake/gcovr.cmake
+++ b/cmake/gcovr.cmake
@@ -14,6 +14,7 @@ if(BUILD_WITH_COVERAGE)
             COMMAND ${GCOVR} --root ${CMAKE_SOURCE_DIR} --object-dir=${CMAKE_BINARY_DIR} --html --html-details -o coverage_output/coverage.html
               --exclude-directories xmpsdk --exclude-directories unitTests --exclude-directories samples
               --exclude '.*xmpsdk.*' --exclude '.*unitTests.*' --exclude '.*samples.*'
+              --exclude-unreachable-branches --exclude-throw-branches
 
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         )