Update the CI checks workflow and cmake to fix lcov errors

Author: DakshitBabbar

.github/workflows/ci.yml

@@ -28,9 +28,9 @@ jobs:
       - name: Run Coverage
         run: |
           make -C build/ coverage
-          declare -a EXCLUDE=("\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*vendor/unity\*" "\*_deps\*")
-          echo ${EXCLUDE[@]} | xargs lcov --rc branch_coverage=1 -r build/coverage.info -o build/coverage.info
-          lcov --rc branch_coverage=1 --list build/coverage.info
+          declare -a EXCLUDE=("\*_deps\*")
+          echo ${EXCLUDE[@]} | xargs lcov --rc lcov_branch_coverage=1 -r build/coverage.info -o build/coverage.info
+          lcov --rc lcov_branch_coverage=1 --summary build/coverage.info
       - name: Check Coverage
         uses: FreeRTOS/CI-CD-Github-Actions/coverage-cop@main
         with:
@@ -93,7 +93,7 @@ jobs:
       - name: Clone coreJSON
         run: git clone https://github.com/FreeRTOS/coreJSON.git --depth 1 --branch v3.2.0
       - name: Clone tinycbor
-        run: git clone https://github.com/intel/tinycbor.git --depth 1 --branch main 
+        run: git clone https://github.com/intel/tinycbor.git --depth 1 --branch main
       - name: Install Python3
         uses: actions/setup-python@v3
         with:

tools/cmock/coverage.cmake

@@ -1,22 +1,29 @@
 # Taken from amazon-freertos repository
 cmake_minimum_required(VERSION 3.13)
 set(BINARY_DIR ${CMAKE_BINARY_DIR})
+
 # reset coverage counters
 execute_process(
-  COMMAND lcov --directory ${CMAKE_BINARY_DIR} --base-directory
-          ${CMAKE_BINARY_DIR} --zerocounters
+  COMMAND lcov --directory ${CMAKE_BINARY_DIR}
+               --base-directory ${CMAKE_BINARY_DIR}
+               --zerocounters
   COMMAND mkdir -p ${CMAKE_BINARY_DIR}/coverage)
-# make the initial/baseline capture a zeroed out files
+
+  # make the initial/baseline capture a zeroed out files
 execute_process(
-  COMMAND
-    lcov --directory ${CMAKE_BINARY_DIR} --base-directory ${CMAKE_BINARY_DIR}
-    --initial --capture --rc lcov_branch_coverage=1 --rc
-    genhtml_branch_coverage=1
-    --output-file=${CMAKE_BINARY_DIR}/base_coverage.info)
-file(GLOB files "${CMAKE_BINARY_DIR}/bin/tests/*")
+  COMMAND lcov --directory ${CMAKE_BINARY_DIR}
+               --base-directory ${CMAKE_BINARY_DIR}
+               --initial
+               --capture
+               --rc lcov_branch_coverage=1
+               --rc genhtml_branch_coverage=1
+               --output-file=${CMAKE_BINARY_DIR}/base_coverage.info
+               --include "*source*")
 
+file(GLOB files "${CMAKE_BINARY_DIR}/bin/tests/*")
 set(REPORT_FILE ${CMAKE_BINARY_DIR}/utest_report.txt)
 file(WRITE ${REPORT_FILE} "")
+
 # execute all files in bin directory, gathering the output to show it in CI
 foreach(testname ${files})
   get_filename_component(test ${testname} NAME_WLE)
@@ -34,18 +41,24 @@ execute_process(COMMAND ruby ${CMOCK_DIR}/vendor/unity/auto/parse_output.rb -xml
 
 # capture data after running the tests
 execute_process(
-  COMMAND
-    lcov --capture --rc lcov_branch_coverage=1 --rc genhtml_branch_coverage=1
-    --base-directory ${CMAKE_BINARY_DIR} --directory ${CMAKE_BINARY_DIR}
-    --output-file ${CMAKE_BINARY_DIR}/second_coverage.info)
+  COMMAND lcov --capture
+               --rc lcov_branch_coverage=1
+               --rc genhtml_branch_coverage=1
+               --base-directory ${CMAKE_BINARY_DIR}
+               --directory ${CMAKE_BINARY_DIR}
+               --output-file ${CMAKE_BINARY_DIR}/second_coverage.info
+               --include "*source*")
 
 # combile baseline results (zeros) with the one after running the tests
 execute_process(
-  COMMAND
-    lcov --base-directory ${CMAKE_BINARY_DIR} --directory ${CMAKE_BINARY_DIR}
-    --add-tracefile ${CMAKE_BINARY_DIR}/base_coverage.info --add-tracefile
-    ${CMAKE_BINARY_DIR}/second_coverage.info --output-file
-    ${CMAKE_BINARY_DIR}/coverage.info --no-external --rc lcov_branch_coverage=1)
+  COMMAND lcov --base-directory ${CMAKE_BINARY_DIR}
+               --directory ${CMAKE_BINARY_DIR}
+               --add-tracefile ${CMAKE_BINARY_DIR}/base_coverage.info
+               --add-tracefile ${CMAKE_BINARY_DIR}/second_coverage.info
+               --output-file ${CMAKE_BINARY_DIR}/coverage.info
+               --no-external
+               --rc lcov_branch_coverage=1)
+
 execute_process(
   COMMAND
     genhtml --rc lcov_branch_coverage=1 --branch-coverage --output-directory