From 5aa8ef63d7fb1df2396b2bc79f9c8cbe01c132b9 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Wed, 1 Nov 2023 18:42:18 -0700 Subject: [PATCH] ci: fix coverage build Problem: It appears that the coverage check commands return a nonzero exit status even when `make check-code-coverage` succeeds, and therefore `make recheck` is unnecessarily executed. The failure appears to be in one of the post-check steps, which are possibly duplicated from the cmake version of `make check-code-coverage`. In any event, remove 'coverage html' (which probably isn't useful anyway), and make success of `coverage xml` and `coverage report` optional. --- src/test/checks_run.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/checks_run.sh b/src/test/checks_run.sh index 1bfd604b1..3a8e43739 100755 --- a/src/test/checks_run.sh +++ b/src/test/checks_run.sh @@ -118,14 +118,14 @@ if test "$COVERAGE" = "t"; then ARGS="$ARGS --enable-code-coverage" CHECKCMDS="\ - ENABLE_USER_SITE=1 \ - COVERAGE_PROCESS_START=$(pwd)/coverage.rc \ + export ENABLE_USER_SITE=1 && \ + export COVERAGE_PROCESS_START=$(pwd)/coverage.rc && \ ${MAKE} -j $JOBS check-code-coverage && \ lcov -l flux*-coverage.info && \ coverage combine .coverage* && \ - coverage html && coverage xml && - chmod 444 coverage.xml && - coverage report" + (coverage xml || :) && + (chmod 444 coverage.xml || :) && + (coverage report || :)" # Use make install for T_INSTALL: elif test "$TEST_INSTALL" = "t"; then