aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/analysis
diff options
context:
space:
mode:
authorGravatar laszlocsomor <laszlocsomor@google.com>2017-07-06 07:07:48 -0400
committerGravatar John Cater <jcater@google.com>2017-07-06 07:14:21 -0400
commit4ca8b8f98f043ef624b2d1605d658aa39c2c63dc (patch)
treeff8c8136671d594ef197e249d3b50def7d516b7d /src/test/java/com/google/devtools/build/lib/analysis
parent3903c92b4d7115bea2be275a0430617f31bd7182 (diff)
Android tests: prepare tests for parameter files
Prepare tests for an upcoming change where some Android actions will use a parameter file, because they expect command line flags with lists of files and the list separators don't work on Windows. See https://github.com/bazelbuild/bazel/issues/3264 RELNOTES: none PiperOrigin-RevId: 161064058
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 833cd9c6d3..d8e079ea11 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -688,6 +688,14 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
return (SpawnAction) getGeneratingAction(artifact);
}
+ protected final List<String> getGeneratingSpawnActionArgs(Artifact artifact) {
+ SpawnAction a = getGeneratingSpawnAction(artifact);
+ ParameterFileWriteAction p = findParamsFileAction(a);
+ return p == null
+ ? a.getArguments()
+ : ImmutableList.copyOf(Iterables.concat(a.getArguments(), p.getContents()));
+ }
+
protected SpawnAction getGeneratingSpawnAction(ConfiguredTarget target, String outputName) {
return getGeneratingSpawnAction(
Iterables.find(getFilesToBuild(target), artifactNamed(outputName)));