diff options
author | 2017-07-14 16:45:43 +0200 | |
---|---|---|
committer | 2017-07-17 10:10:37 +0200 | |
commit | 681b8174d5ae989cf9489716e4c15a54c2d36bc4 (patch) | |
tree | 11b9fef3e184fd4df6a6b24e7fdff88ab7ff2fc9 /src/main/java/com/google | |
parent | a5d977b2efccd06b9ff25572c518c176b379f61b (diff) |
Promote getPossibleInputsForTesting from CppCompileAction to CommandAction, in
order to allow tests that depend on pruned inputs to work for both the legacy
and crosstool cases.
PiperOrigin-RevId: 161955432
Diffstat (limited to 'src/main/java/com/google')
3 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java b/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java index 38e9f2ce95..9c2d31ec86 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java +++ b/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java @@ -31,4 +31,7 @@ public interface CommandAction extends Action, ExecutionInfoSpecifier { * in which this action should be run. */ ImmutableMap<String, String> getEnvironment(); + + /** Returns inputs to this action, including inputs that may be pruned. */ + Iterable<Artifact> getPossibleInputsForTesting(); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 8ca651b757..5807881607 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -210,6 +210,12 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie return SkylarkList.createImmutable(getArguments()); } + @Override + @VisibleForTesting + public Iterable<Artifact> getPossibleInputsForTesting() { + return getInputs(); + } + /** Returns command argument, argv[0]. */ @VisibleForTesting public String getCommandFilename() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java index 9122b8c539..ce96697bbc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java @@ -195,6 +195,12 @@ public final class CppLinkAction extends AbstractAction } @Override + @VisibleForTesting + public Iterable<Artifact> getPossibleInputsForTesting() { + return getInputs(); + } + + @Override public Iterable<String> getClientEnvironmentVariables() { return clientEnvironmentVariables; } |