From b21cfa12b83072bcb6d7e700542e7051a7d21bce Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 16 Dec 2016 14:31:42 +0000 Subject: 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 --- .../build/lib/standalone/StandaloneActionContextProvider.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java') 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 strategiesBuilder = ImmutableList.builder(); -- cgit v1.2.3