aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2017-03-03 15:24:06 +0000
committerGravatar Yue Gan <yueg@google.com>2017-03-06 09:44:57 +0000
commit584843e5bb009c38ba215a141b121f6d7b8a33de (patch)
treea4d84bfdb9af6ced27020aa6706f543c88273dce /src/test/java
parent934c1d5e1340bbae9bd7b61a9f3aa3029c7c2c1c (diff)
Remove all the action resource estimation code
-- PiperOrigin-RevId: 149110466 MOS_MIGRATED_REVID=149110466
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java5
-rw-r--r--src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java12
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java7
-rw-r--r--src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java6
-rw-r--r--src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java11
5 files changed, 0 insertions, 41 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 92eeedffad..24d321c182 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -38,7 +38,6 @@ import com.google.devtools.build.lib.actions.ArtifactOwner;
import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.MutableActionGraph;
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.actions.cache.MetadataHandler;
import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
@@ -247,10 +246,6 @@ public final class ActionsTestUtil {
@Override protected String computeKey() { return "action"; }
- @Override public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
@Override
public String getMnemonic() {
return "Null";
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
index 2d74dd8426..9c39d84a29 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
@@ -20,12 +20,9 @@ import com.google.devtools.build.lib.actions.AbstractAction;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,9 +39,6 @@ public class TestAction extends AbstractAction {
public static final Runnable NO_EFFECT = new Runnable() { @Override public void run() {} };
- private static final ResourceSet RESOURCES =
- ResourceSet.createWithRamCpuIo(/*memoryMb=*/1.0, /*cpu=*/0.1, /*io=*/0.0);
-
protected final Callable<Void> effect;
/** Use this constructor if the effect can't throw exceptions. */
@@ -139,12 +133,6 @@ public class TestAction extends AbstractAction {
@Override
public String getMnemonic() { return "Test"; }
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return RESOURCES;
- }
-
-
/** No-op action that has exactly one output, and can be a middleman action. */
public static class DummyAction extends TestAction {
private final MiddlemanType type;
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 8291d8e096..de1247e846 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -28,11 +28,9 @@ import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ArtifactFactory;
import com.google.devtools.build.lib.actions.ArtifactOwner;
import com.google.devtools.build.lib.actions.ExecutionStrategy;
-import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.MiddlemanFactory;
import com.google.devtools.build.lib.actions.MutableActionGraph;
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
@@ -220,11 +218,6 @@ public final class AnalysisTestUtil {
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
public String computeKey() {
return "";
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java
index 05442e6114..7ef96779fd 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.actions.util.DummyExecutor;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -63,11 +62,6 @@ public class ActionDataTest extends TimestampBuilderTestCase {
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
return "MyAction";
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
index 968406c9a8..02c2b41a26 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.actions.util.DummyExecutor;
import com.google.devtools.build.lib.util.Fingerprint;
@@ -212,11 +211,6 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase {
protected String computeKey() {
return getPrimaryOutput().getExecPathString() + executionCounter.get();
}
-
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
}
private static class ExecutionCountingCacheBypassingAction extends ExecutionCountingAction {
@@ -659,11 +653,6 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase {
protected String computeKey() {
return new Fingerprint().addInt(42).hexDigestAndReset();
}
-
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
}
private abstract static class SingleOutputSkyframeAwareAction extends SingleOutputAction