Make CC_CODE_COVERAGE_SCRIPT failures fail tests

If you're editing, or overriding, this script and you introduce and
introduce an error, previously this wouldn't fail the test invocation.

Author: keith

.bazelrc

@@ -57,6 +57,9 @@ build --java_language_version=21
 build --tool_java_language_version=21
 build --tool_java_runtime_version=21
 
+# TODO: Fix tests that fail without this flag
+coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1
+
 # User-specific .bazelrc
 try-import %workspace%/user.bazelrc
 

src/test/shell/bazel/bazel_coverage_hermetic_py_test.sh

@@ -21,6 +21,9 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CURRENT_DIR}/../integration_test_setup.sh" \
   || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
+
 # Fetch hermetic python and register toolchain.
 function set_up() {
     cat >>MODULE.bazel <<EOF

src/test/shell/bazel/bazel_coverage_java_test.sh

@@ -30,6 +30,8 @@ JAVA_TOOLS_PREBUILT_ZIP="$1"; shift
 
 override_java_tools "${RULES_JAVA_REPO_NAME}" "${JAVA_TOOLS_ZIP}" "${JAVA_TOOLS_PREBUILT_ZIP}"
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
 COVERAGE_GENERATOR_WORKSPACE_FILE="$1"; shift
 if [[ "${COVERAGE_GENERATOR_WORKSPACE_FILE}" != "released" ]]; then
   COVERAGE_GENERATOR_DIR="$(dirname "$(rlocation $COVERAGE_GENERATOR_WORKSPACE_FILE)")"

src/test/shell/bazel/bazel_coverage_py_test.sh

@@ -23,6 +23,9 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
 source "${CURRENT_DIR}/coverage_helpers.sh" \
   || { echo "coverage_helpers.sh not found!" >&2; exit 1; }
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
+
 # Returns 0 if gcov is not installed or if a version before 7.0 was found.
 # Returns 1 otherwise.
 function is_gcov_missing_or_wrong_version() {

src/test/shell/bazel/bazel_coverage_sh_test.sh

@@ -23,6 +23,8 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
 source "${CURRENT_DIR}/coverage_helpers.sh" \
   || { echo "coverage_helpers.sh not found!" >&2; exit 1; }
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
 
 function set_up_sh_test_coverage() {
   add_rules_shell "MODULE.bazel"

src/test/shell/bazel/bazel_execlog_test.sh

@@ -20,6 +20,9 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CURRENT_DIR}/../integration_test_setup.sh" \
   || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
+
 function test_dir_depends() {
   create_new_workspace
   cat > starlark.bzl <<'EOF'

src/test/shell/bazel/remote/build_without_the_bytes_test.sh

@@ -44,6 +44,9 @@ source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
 source "$(rlocation "io_bazel/src/test/shell/bazel/remote/remote_utils.sh")" \
   || { echo "remote_utils.sh not found!" >&2; exit 1; }
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
+
 function set_up() {
   start_worker
 }

src/test/shell/bazel/remote/remote_execution_test.sh

@@ -46,6 +46,9 @@ source "$(rlocation "io_bazel/src/test/shell/bazel/remote_helpers.sh")" \
 source "$(rlocation "io_bazel/src/test/shell/bazel/remote/remote_utils.sh")" \
   || { echo "remote_utils.sh not found!" >&2; exit 1; }
 
+# TODO: Fix tests that fail without this flag
+add_to_bazelrc "coverage --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
+
 function set_up() {
   start_worker
 }

tools/test/collect_coverage.sh

@@ -179,8 +179,11 @@ fi
 # TODO(bazel-team): cd should be avoided.
 cd $ROOT
 # Call the C++ code coverage collection script.
-if [[ "$CC_CODE_COVERAGE_SCRIPT" ]]; then
-    eval "${CC_CODE_COVERAGE_SCRIPT}"
+if [[ -n "$GENERATE_LLVM_LCOV" && "$CC_CODE_COVERAGE_SCRIPT" ]]; then
+    if ! eval "${CC_CODE_COVERAGE_SCRIPT}" && test -z "${IGNORE_COVERAGE_COLLECTION_FAILURES:-}"; then
+      echo "error: coverage collection script failed" >&2
+      exit 1
+    fi
 fi
 
 if [[ -z "$LCOV_MERGER" ]]; then