diff options
| author |  Ulf Adams <ulfjack@google.com> | 2016-12-16 14:31:42 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-12-16 15:37:54 +0000 |
| commit | b21cfa12b83072bcb6d7e700542e7051a7d21bce (patch) | |
| tree | a1f51046f42c7651f491cd8d5ec6d7c245eee563 /src/main/java/com/google/devtools/build/lib/standalone | |
| parent | c8ac9187b0e62f9758095e479d85680c6f5c780c (diff) | |
Continued TestStrategy refactoring.
More renaming and some reformatting to make StandaloneTestStrategy more
closely resemble the internal implementation of TestStrategy.
--
PiperOrigin-RevId: 142254302
MOS_MIGRATED_REVID=142254302
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/standalone')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java index 94b9d0da2d..668e76b313 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.buildtool.BuildRequest; import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.exec.FileWriteStrategy; import com.google.devtools.build.lib.exec.StandaloneTestStrategy; +import com.google.devtools.build.lib.exec.TestStrategy; import com.google.devtools.build.lib.rules.cpp.IncludeScanningContext; import com.google.devtools.build.lib.rules.cpp.SpawnGccStrategy; import com.google.devtools.build.lib.rules.cpp.SpawnLinkStrategy; @@ -33,6 +34,7 @@ import com.google.devtools.build.lib.rules.test.ExclusiveTestStrategy; import com.google.devtools.build.lib.rules.test.TestActionContext; import com.google.devtools.build.lib.runtime.CommandEnvironment; import com.google.devtools.build.lib.vfs.FileSystemUtils; +import com.google.devtools.build.lib.vfs.Path; import java.io.IOException; /** @@ -67,12 +69,13 @@ public class StandaloneActionContextProvider extends ActionContextProvider { public StandaloneActionContextProvider(CommandEnvironment env, BuildRequest buildRequest) { this.env = env; - boolean verboseFailures = buildRequest.getOptions(ExecutionOptions.class).verboseFailures; + ExecutionOptions options = buildRequest.getOptions(ExecutionOptions.class); + boolean verboseFailures = options.verboseFailures; + Path testTmpRoot = TestStrategy.getTmpRoot(env.getWorkspace(), env.getExecRoot(), options); TestActionContext testStrategy = new StandaloneTestStrategy( - buildRequest, env.getBlazeWorkspace().getBinTools(), env.getClientEnv(), - env.getWorkspace()); + buildRequest, env.getBlazeWorkspace().getBinTools(), env.getClientEnv(), testTmpRoot); Builder<ActionContext> strategiesBuilder = ImmutableList.builder(); |