aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar Philipp Wollermann <philwo@google.com>2016-02-27 06:31:58 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-02-28 17:05:05 +0000
commitcbc81f8c91affc7799f35bcc359a85db15aa479b (patch)
tree2aa75b280d35ae2525d8cf4cd84916daade3a077 /src/test/java/com/google/devtools/build
parent4e65601c34349fe2047df713903265690f33a5e6 (diff)
Little refactorings on resource management stuff:
- Remove unneeded abstract override AbstractAction#getResourceConsumption() - Remove comments justifying returning ResourceSet.ZERO from getResourceConsumption() - instead document it once on the base method. - Replace ResourceSet.create(0, 0, 0) with ResourceSet.ZERO. - Make sure no one ever returns null from getResourceConsumption() and then simplify the code in SkyframeActionExecutor to not check for it. -- MOS_MIGRATED_REVID=115739250
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r--src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java2
1 files changed, 2 insertions, 0 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 00b1fccff6..f99503f583 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
@@ -228,9 +228,11 @@ 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";