diff options
| author |  Googler <noreply@google.com> | 2017-05-24 22:20:45 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-05-26 09:36:15 +0200 |
| commit | d0e58c4790f499afa5d1fcafb2f9e4c3f47b3ca0 (patch) | |
| tree | 15af629799daa35970627d59fe138a7b17e17e58 /src/main/java/com/google/devtools/build/lib/exec | |
| parent | 721ea3e46922df63205e0ba87e49a50449e2f78b (diff) | |
Automated g4 rollback of commit e2edf2e141a09c025a958d580c7cac7b57c70d83.
*** Reason for rollback ***
Rollforward with fix.
*** Original change description ***
Automated g4 rollback of commit c78c947e6a8cbb323304f872a3dcabb989a3d76b.
*** Reason for rollback ***
Breaks android targets in the nightly - see []
*** Original change description ***
Do not retain transitive data in AndroidLocalTestBase...
***
ROLLBACK_OF=156745610
RELNOTES: None
PiperOrigin-RevId: 157028029
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/exec')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java index 7d98a9a942..4326269ccf 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.exec; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; import com.google.common.io.Closeables; @@ -188,7 +189,7 @@ public abstract class TestStrategy implements TestActionContext { // Execute the test using the alias in the runfiles tree, as mandated by the Test Encyclopedia. args.add(execSettings.getExecutable().getRootRelativePath().getCallablePathString()); - args.addAll(execSettings.getArgs()); + Iterables.addAll(args, execSettings.getArgs().arguments()); return ImmutableList.copyOf(args); } |