diff options
author | 2017-02-28 10:46:53 +0000 | |
---|---|---|
committer | 2017-02-28 11:33:55 +0000 | |
commit | 5ea2b14a9cece2e42779a8b3e4e8f3483e991ee1 (patch) | |
tree | ce979a2de599144bc8f6b33a48f2e7b562e7ca81 /src/test/java/com/google/devtools/build/lib/actions/util | |
parent | 8afbd3c65339665992ece415e268955394507559 (diff) |
Clean up the semantics of input discovering actions a bit by making updateInputs() and inputsKnown() non-overridable and removing setInputs().
This comes at the cost of adding a flag to every action instance that's not used for non-input-discovering actions, but I think that's a deal. Simpler APIs are good, mmmmkay?
Also fixed a few pre-existing issues in TestAction and ObjcCompileAction.
--
PiperOrigin-RevId: 148749734
MOS_MIGRATED_REVID=148749734
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/actions/util')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 c0a32308af..2d74dd8426 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 @@ -81,7 +81,7 @@ public class TestAction extends AbstractAction { @Override public boolean discoversInputs() { for (Artifact input : getInputs()) { - if (!input.getExecPath().getBaseName().endsWith(".optional")) { + if (input.getExecPath().getBaseName().endsWith(".optional")) { return true; } } @@ -91,6 +91,7 @@ public class TestAction extends AbstractAction { @Override public Iterable<Artifact> discoverInputs(ActionExecutionContext actionExecutionContext) { Preconditions.checkState(discoversInputs(), this); + updateInputs(getInputs()); return ImmutableList.of(); } |