Skip to content

Commit 5b69ac8

Browse files
committed
Delegate coverage tools to @remote_coverage_tools
Requires: - bazelbuild#10379 is merged - a new remote coverage tools zip pushed - coverage.WORKSPACE updated to the new tools This changes the @bazel_tools//tools/test/BUILD file to fully delegate to the @remote_coverage_tools repository, which must contain rules for :lcov_merger and :coverage_report_generator. This makes the @remote_coverage_tools reference self-contained, which allows overriding the tools using --override_repository, and allows independently replacing or fixing them. Progress on bazelbuild#4685. Change-Id: I321c62332f00d910f4ccfb3244d63e60627d59ad
1 parent 0552bd7 commit 5b69ac8

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static LabelLateBoundDefault<TestConfiguration> coverageSupportAttribute(
104104
"//tools/test:coverage_report_generator";
105105

106106
private static final String DEFAULT_COVERAGE_OUTPUT_GENERATOR_VALUE =
107-
"@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main";
107+
"@bazel_tools//tools/test:lcov_merger";
108108

109109
@AutoCodec
110110
static final Resolver<TestConfiguration, Label> COVERAGE_REPORT_GENERATOR_CONFIGURATION_RESOLVER =

tools/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ filegroup(
6161
"//tools/python:embedded_tools",
6262
"//tools/runfiles:embedded_tools",
6363
"//tools/test:embedded_tools",
64-
"//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:embedded_tools",
6564
"//tools/osx/crosstool:srcs",
6665
"//tools/osx:srcs",
6766
"//tools/sh:embedded_tools",

tools/test/BUILD.tools

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,14 @@ filegroup(
3333
srcs = ["collect_coverage.sh"],
3434
)
3535

36-
filegroup(
36+
alias(
3737
name = "coverage_report_generator",
38-
srcs = ["@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main"],
38+
actual = "@remote_coverage_tools//:coverage_report_generator",
39+
)
40+
41+
alias(
42+
name = "lcov_merger",
43+
actual = "@remote_coverage_tools//:lcov_merger",
3944
)
4045

4146
filegroup(

tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator/BUILD

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,3 @@ filegroup(
170170
srcs = glob(["**"]),
171171
visibility = ["//visibility:public"],
172172
)
173-
174-
filegroup(
175-
name = "embedded_tools",
176-
srcs = [
177-
"BUILD.tools",
178-
],
179-
visibility = ["//visibility:public"],
180-
)

tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator/BUILD.tools

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)