Remove LCOV merger dependency of cc_test without coverage

src/main/starlark/builtins_bzl/common/cc/cc_test.bzl

@@ -137,7 +137,7 @@ def make_cc_test(with_linkstatic = False, with_aspects = False):
  "stripped_binary": "%{name}.stripped",
  "dwp_file": "%{name}.dwp",
  },
- fragments = ["google_cpp", "cpp"],
+ fragments = ["google_cpp", "cpp", "coverage"],
  exec_groups = {
  "cpp_link": exec_group(copy_from_rule = True),
  },

src/main/starlark/builtins_bzl/common/cc/semantics.bzl

@@ -87,14 +87,14 @@ def _get_test_malloc_attr():
 def _get_coverage_attrs():
  return {
  "_lcov_merger": attr.label(
- default = "@bazel_tools//tools/test:lcov_merger",
+ default = configuration_field(fragment = "coverage", name = "output_generator"),
  executable = True,
- cfg = "target",
+ cfg = "exec",
  ),
  "_collect_cc_coverage": attr.label(
  default = "@bazel_tools//tools/test:collect_cc_coverage",
  executable = True,
- cfg = "target",
+ cfg = "exec",
  ),
  }
 

src/test/shell/bazel/cc_integration_test.sh

@@ -1816,4 +1816,46 @@ EOF
  --repo_env=BAZEL_CONLYOPTS=-DEXIT_CODE=0 || fail "Expected C compilation to pass"
 }
 
+function test_cc_test_no_target_coverage_dep() {
+ # Regression test for https:/bazelbuild/bazel/issues/16961
+ local package="${FUNCNAME[0]}"
+ mkdir -p "${package}"
+
+ cat > "${package}"/BUILD.bazel <<'EOF'
+cc_test(
+ name = "test",
+ srcs = ["test.cc"],
+)
+EOF
+ touch "${package}"/test.cc
+
+ out=$(bazel cquery --collect_code_coverage \
+ "deps(//${package}:test) intersect config(@remote_coverage_tools//:all, target)")
+ if [[ -n "$out" ]]; then
+ fail "Expected no dependency on lcov_merger in the target configuration, but got: $out"
+ fi
+}
+
+function test_cc_test_no_lcov_merger_dep_without_coverage() {
+ # Regression test for https:/bazelbuild/bazel/issues/16961
+ local package="${FUNCNAME[0]}"
+ mkdir -p "${package}"
+
+ cat > "${package}"/BUILD.bazel <<'EOF'
+cc_test(
+ name = "test",
+ srcs = ["test.cc"],
+)
+EOF
+ touch "${package}"/test.cc
+
+ # FIXME: cc_test still unconditionally depends on the LCOV merger binary through
+ # @remote_coverage_tools//:coverage_output_generator, which is also unnecessary:
+ # https:/bazelbuild/bazel/issues/15088
+ out=$(bazel cquery "somepath(//${package}:test,@remote_coverage_tools//:lcov_merger)")
+ if [[ -n "$out" ]]; then
+ fail "Expected no dependency on lcov_merger, but got: $out"
+ fi
+}
+
 run_suite "cc_integration_test"