commit 9e91f20bb31e44b4be836996ac9d91af61e1e822
author tomlu <tomlu@google.com> Mon Jun 18 16:16:36 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Jun 18 16:18:08 2018 -0700
tree 7e7c116290099ef5a8e16e67a9d4f5a0c908fbf9
parent d4406d644efcf86327834a56b01cc212389e52e7

Remove support for --discard_actions_after_execution.

The memory savings from this flag are not worth the complexity, and it interferes with action restarting.

RELNOTES: Remove support for --discard_actions_after_execution.
PiperOrigin-RevId: 201077905

src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java
index 5aae728..49f075d 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java
@@ -27,6 +27,7 @@
 import com.google.common.hash.Hashing;
 import com.google.common.util.concurrent.Runnables;
 import com.google.devtools.build.lib.actions.Action;
+import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionException;
 import com.google.devtools.build.lib.actions.ActionInput;
@@ -1227,9 +1228,10 @@
   /** A dummy action template expansion function that just returns the injected actions */
   private static class DummyActionTemplateExpansionFunction implements SkyFunction {
     private final ActionKeyContext actionKeyContext;
-    private final List<Action> actions;
+    private final ImmutableList<ActionAnalysisMetadata> actions;
 
-    DummyActionTemplateExpansionFunction(ActionKeyContext actionKeyContext, List<Action> actions) {
+    DummyActionTemplateExpansionFunction(
+        ActionKeyContext actionKeyContext, ImmutableList<ActionAnalysisMetadata> actions) {
       this.actionKeyContext = actionKeyContext;
       this.actions = actions;
     }
@@ -1238,7 +1240,7 @@
     public SkyValue compute(SkyKey skyKey, Environment env) {
       try {
         return new ActionTemplateExpansionValue(
-            Actions.filterSharedActionsAndThrowActionConflict(actionKeyContext, actions), false);
+            Actions.filterSharedActionsAndThrowActionConflict(actionKeyContext, actions));
       } catch (ActionConflictException e) {
         throw new IllegalStateException(e);
       }