diff options
| author |  Philipp Wollermann <philwo@google.com> | 2016-02-27 06:31:58 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-28 17:05:05 +0000 |
| commit | cbc81f8c91affc7799f35bcc359a85db15aa479b (patch) | |
| tree | 2aa75b280d35ae2525d8cf4cd84916daade3a077 /src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java | |
| parent | 4e65601c34349fe2047df713903265690f33a5e6 (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/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 6fc354b6ff..5f456d7a53 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 @@ -299,9 +299,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa @Override public ResourceSet estimateResourceConsumption(Executor executor) { - // return null here to indicate that resources would be managed manually - // during action execution. - return null; + return ResourceSet.ZERO; } @Override |