[6.1.0]Only fetch @remote_coverage_tools when collecting coverage (bazelbuild#17287)

ShreeM01 · fmeum · keertk · web-flow · commit ee1daaf9852d · 2023-02-19T03:26:45.000Z
* Only fetch @remote_coverage_tools when collecting coverage Before this change, every test rule had an implicit dependency on `@bazel_tools//tools/test:coverage_report_generator`, even though this tool is only used when collecting coverage. This is fixed by moving it to `CoverageOptions` and using the late-bound default resolver to only create a dependency if coverage is enabled. Also adds `CoverageOptions` to the set of options classes trimmed by `--trim_test_configuration` so that, as before, changing `--coverage_report_generator` doesn't cause non-test rules to be reanalyzed. This behavior now extends to `--coverage_output_generator`. Fixes bazelbuild#15088 Closes bazelbuild#16995. PiperOrigin-RevId: 498949871 Change-Id: I2440fae2655bbb701e918ee2aa7acb008d8f97ed * Update BUILD --------- Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im> Co-authored-by: keertk <110264242+keertk@users.noreply.github.com>
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -2541,7 +2541,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/test",
         "//src/main/java/com/google/devtools/common/options",
-        "//third_party:jsr305",
+        "//third_party:jsr305_checked_in",
     ],
 )
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/BUILD b/src/main/java/com/google/devtools/build/lib/rules/BUILD
@@ -59,6 +59,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
+        "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
         "//src/main/java/com/google/devtools/build/lib/analysis:test/coverage_configuration",
         "//src/main/java/com/google/devtools/build/lib/analysis:test/test_configuration",
         "//src/main/java/com/google/devtools/build/lib/analysis:test/test_trimming_transition_factory",

Original file line number	Diff line number	Diff line change
`@@ -2541,7 +2541,7 @@ java_library(`
`2541`	`2541`	`"//src/main/java/com/google/devtools/build/lib/concurrent",`
`2542`	`2542`	`"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/test",`
`2543`	`2543`	`"//src/main/java/com/google/devtools/common/options",`
`2544`		`- "//third_party:jsr305",`
	`2544`	`+ "//third_party:jsr305_checked_in",`
`2545`	`2545`	`],`
`2546`	`2546`	`)`
`2547`	`2547`