Add the coverage report generator to TestParams when the configuration says we should collect coverage, not only when the rule says so.

--
MOS_MIGRATED_REVID=135896208

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java
index 5992a80ae6..d71986193b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestActionBuilder.java
@@ -283,7 +283,10 @@ public final class TestActionBuilder {
     }
     // TODO(bazel-team): Passing the reportGenerator to every TestParams is a bit strange.
     Artifact reportGenerator = null;
-    if (collectCodeCoverage) {
+    if (config.isCodeCoverageEnabled()) {
+      // It's not enough to add this if the rule has coverage enabled because the command line may
+      // contain rules with baseline coverage but no test rules that have coverage enabled, and in
+      // that case, we still need the report generator.
       reportGenerator = ruleContext.getPrerequisiteArtifact(
           "$coverage_report_generator", Mode.HOST);
     }