fix: wrong overall coverage report dependencies

avengineers · Dec 4, 2023 · f18b209 · f18b209
1 parent 213aa3e
commit f18b209
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cmake/common.cmake b/cmake/common.cmake
@@ -252,7 +252,8 @@ function(_spl_coverage_create_overall_report)
         add_custom_command(
             OUTPUT ${COV_OUT_VARIANT_HTML}
             COMMAND gcovr --root ${CMAKE_SOURCE_DIR} --add-tracefile \"${CMAKE_CURRENT_BINARY_DIR}/**/coverage.json\" --html --html-details --output ${COV_OUT_VARIANT_HTML}
-            DEPENDS coverage
+            DEPENDS ${GLOBAL_COMPONENTS_COVERAGE_JSON_LIST}
+            COMMENT "Generating coverage overall report ${OUTPUT}..."
         )
         add_custom_target(
             unittests
@@ -261,7 +262,7 @@ function(_spl_coverage_create_overall_report)
         add_custom_target(
             coverage_overall_report
             ALL
-            DEPENDS coverage ${COV_OUT_VARIANT_HTML}
+            DEPENDS ${COV_OUT_VARIANT_HTML}
         )
     else(_SPL_COVERAGE_CREATE_OVERALL_REPORT_IS_NECESSARY)
         add_custom_target(unittests)
@@ -318,6 +319,8 @@ macro(_spl_add_test_suite PROD_SRC TEST_SOURCES)
     )
 
     # Create coverage report
+    set(GLOBAL_COMPONENTS_COVERAGE_JSON_LIST "${GLOBAL_COMPONENTS_COVERAGE_JSON_LIST};${CMAKE_CURRENT_BINARY_DIR}/coverage.json" CACHE INTERNAL "List of all coverage.json files")
+
     set(COV_OUT_JSON coverage.json)
     add_custom_command(
         OUTPUT ${COV_OUT_JSON}
@@ -326,13 +329,15 @@ macro(_spl_add_test_suite PROD_SRC TEST_SOURCES)
         # Run gcovr to generate coverage json for the component
         COMMAND gcovr --root ${CMAKE_SOURCE_DIR} --json --output ${COV_OUT_JSON} ${GCOVR_ADDITIONAL_OPTIONS} ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS ${TEST_OUT_JUNIT}
+        COMMENT "Generating component ${component_name} coverage json report ${COV_OUT_JSON}..."
     )
 
     set(COV_OUT_HTML reports/coverage/index.html)
     add_custom_command(
         OUTPUT ${COV_OUT_HTML}
         COMMAND gcovr --root ${CMAKE_SOURCE_DIR} --add-tracefile ${COV_OUT_JSON} --html --html-details --output ${COV_OUT_HTML} ${GCOVR_ADDITIONAL_OPTIONS}
         DEPENDS ${COV_OUT_JSON}
+        COMMENT "Generating component ${component_name} coverage html report ${COV_OUT_HTML}..."
     )
 
     add_custom_target(