diff options
| author |  cpeyser <cpeyser@google.com> | 2017-05-22 18:23:41 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-05-23 12:45:08 +0200 |
| commit | e2edf2e141a09c025a958d580c7cac7b57c70d83 (patch) | |
| tree | e04eadb53c175ffb910222683a3a56f616c4e608 /src/main/java/com/google/devtools/build/lib/exec | |
| parent | 7e91ad631a660ae12a2b8dcfb8ba42574a7a76d3 (diff) | |
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.
The argument strings and artifacts were both transitive and flattened, causing O(N^2) memory consumption.
PiperOrigin-RevId: 156745610
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, 1 insertions, 2 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 4326269ccf..7d98a9a942 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,7 +17,6 @@ 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; @@ -189,7 +188,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()); - Iterables.addAll(args, execSettings.getArgs().arguments()); + args.addAll(execSettings.getArgs()); return ImmutableList.copyOf(args); } |