From 3ead6bbefb9f248d712e5ef65ff3cefb920f5ddb Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Thu, 20 Apr 2017 17:39:01 +0200
Subject: Remove --microcoverage support

This feature is unused and depends on emma, which is obsolete.

PiperOrigin-RevId: 153713051
---
 .../build/lib/rules/test/TestActionBuilder.java    |  8 +------
 .../build/lib/rules/test/TestRunnerAction.java     | 28 +---------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/test')

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 5624b2bddb..a3792ec5bb 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
@@ -282,16 +282,10 @@ public final class TestActionBuilder {
           coverageArtifacts.add(coverageArtifact);
         }
 
-        Artifact microCoverageArtifact = null;
-        if (collectCodeCoverage && config.isMicroCoverageEnabled()) {
-          microCoverageArtifact = ruleContext.getPackageRelativeArtifact(
-              targetName.getRelative(shardRunDir + "coverage.micro.dat"), root);
-        }
-
         env.registerAction(new TestRunnerAction(
             ruleContext.getActionOwner(), inputs, testRuntime,
             testLog, cacheStatus,
-            coverageArtifact, microCoverageArtifact,
+            coverageArtifact,
             testProperties, testEnv, executionSettings,
             shard, run, config, ruleContext.getWorkspaceName(),
             useTestRunner));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
index d6c4d45c6d..6db48d097e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
@@ -86,7 +86,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
   private final PathFragment testInfrastructureFailure;
   private final PathFragment baseDir;
   private final Artifact coverageData;
-  private final Artifact microCoverageData;
   private final TestTargetProperties testProperties;
   private final TestTargetExecutionSettings executionSettings;
   private final int shardNum;
@@ -123,7 +122,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
       Artifact testLog,
       Artifact cacheStatus,
       Artifact coverageArtifact,
-      Artifact microCoverageArtifact,
       TestTargetProperties testProperties,
       Map<String, String> extraTestEnv,
       TestTargetExecutionSettings executionSettings,
@@ -135,13 +133,12 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     super(owner, inputs,
         // Note that this action only cares about the runfiles, not the mapping.
         new RunfilesSupplierImpl(PathFragment.create("runfiles"), executionSettings.getRunfiles()),
-        list(testLog, cacheStatus, coverageArtifact, microCoverageArtifact));
+        list(testLog, cacheStatus, coverageArtifact));
     this.runtime = runtime;
     this.configuration = Preconditions.checkNotNull(configuration);
     this.testLog = testLog;
     this.cacheStatus = cacheStatus;
     this.coverageData = coverageArtifact;
-    this.microCoverageData = microCoverageArtifact;
     this.shardNum = shardNum;
     this.runNumber = runNumber;
     this.testProperties = Preconditions.checkNotNull(testProperties);
@@ -207,9 +204,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     outputs.add(ActionInputHelper.fromPath(getUndeclaredOutputsAnnotationsPath()));
     if (isCoverageMode()) {
       outputs.add(getCoverageData());
-      if (isMicroCoverageMode()) {
-        outputs.add(getMicroCoverageData());
-      }
     }
     return outputs;
   }
@@ -358,8 +352,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
 
     // We cannot use coverageData artifact since it may be null. Generate coverage name instead.
     execRoot.getRelative(baseDir.getChild(coveragePrefix + ".dat")).delete();
-    // We cannot use microcoverageData artifact since it may be null. Generate filename instead.
-    execRoot.getRelative(baseDir.getChild(coveragePrefix + ".micro.dat")).delete();
 
     // Delete files fetched from remote execution.
     execRoot.getRelative(baseDir.getChild("test.zip")).delete();
@@ -441,12 +433,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
       env.put("COVERAGE_MANIFEST", getCoverageManifest().getExecPathString());
       env.put("COVERAGE_DIR", getCoverageDirectory().getPathString());
       env.put("COVERAGE_OUTPUT_FILE", getCoverageData().getExecPathString());
-      if (isMicroCoverageMode()) {
-        env.put("MICROCOVERAGE_REQUESTED", "true");
-        env.put("MICROCOVERAGE_OUTPUT_FILE", getMicroCoverageData().getExecPathString());
-      } else {
-        env.put("MICROCOVERAGE_REQUESTED", "false");
-      }
     }
   }
 
@@ -575,18 +561,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     return coverageData != null;
   }
 
-  /**
-   * @return microcoverage data artifact or null if code coverage was not requested.
-   */
-  @Nullable public Artifact getMicroCoverageData() {
-    return microCoverageData;
-  }
-
-  /** Returns true if micro-coverage data should be gathered. */
-  public boolean isMicroCoverageMode() {
-    return microCoverageData != null;
-  }
-
   /**
    * Returns a directory to temporarily store coverage results for the given action relative to the
    * execution root. This directory is used to store all coverage results related to the test
-- 
cgit v1.2.3