From 96a6c119a65838880f024c19ffa5883373312470 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Fri, 4 Apr 2025 10:15:10 +0200 Subject: [PATCH] ci: Force coverage processing to continue on errors and export HTML report --- build-support/custom-modules/ns3-coverage.cmake | 4 +++- utils/tests/gitlab-ci-scheduled.yml | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build-support/custom-modules/ns3-coverage.cmake b/build-support/custom-modules/ns3-coverage.cmake index 4a12a98c1..03e2a86da 100644 --- a/build-support/custom-modules/ns3-coverage.cmake +++ b/build-support/custom-modules/ns3-coverage.cmake @@ -33,13 +33,15 @@ if(${NS3_COVERAGE}) add_custom_target( coverage_gcc COMMAND lcov -o ns3.info -c --directory ${CMAKE_BINARY_DIR} ${zero_counters} + --keep-going --ignore-errors inconsistent WORKING_DIRECTORY ${CMAKE_OUTPUT_DIRECTORY}/coverage DEPENDS run_test_py ) add_custom_target( coverage_html - COMMAND genhtml ns3.info + COMMAND genhtml --ignore-errors inconsistent --ignore-errors corrupt + ns3.info -o ./html WORKING_DIRECTORY ${CMAKE_OUTPUT_DIRECTORY}/coverage DEPENDS coverage_gcc ) diff --git a/utils/tests/gitlab-ci-scheduled.yml b/utils/tests/gitlab-ci-scheduled.yml index 0b12fd551..17dabe844 100644 --- a/utils/tests/gitlab-ci-scheduled.yml +++ b/utils/tests/gitlab-ci-scheduled.yml @@ -252,14 +252,10 @@ weekly-build-coverage: variables: MODE: debug EXTRA_OPTIONS: "--enable-gcov --disable-asserts --disable-logs" - TARGET: coverage_cobertura + TARGET: coverage_html artifacts: paths: - - build/coverage/cobertura.xml - reports: - coverage_report: - coverage_format: cobertura - path: build/coverage/cobertura.xml + - build/coverage/html tags: - nsnam - linux