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

src/test/shell/bazel/bazel_coverage_sh_test.sh

@@ -23,7 +23,6 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
 source "${CURRENT_DIR}/coverage_helpers.sh" \
   || { echo "coverage_helpers.sh not found!" >&2; exit 1; }
 
-
 function set_up_sh_test_coverage() {
   add_rules_shell "MODULE.bazel"
   add_rules_java "MODULE.bazel"

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