diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/exec')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java index db711bcff7..5e33a9ba77 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.exec; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.ActionExecutionContext; -import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.BaseSpawn; import com.google.devtools.build.lib.actions.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecException; @@ -113,10 +112,9 @@ public class StandaloneTestStrategy extends TestStrategy { info.put("timeout", "" + getTimeout(action)); info.putAll(action.getTestProperties().getExecutionInfo()); - Artifact testSetup = action.getRuntimeArtifact(TEST_SETUP_BASENAME); Spawn spawn = new BaseSpawn( - getArgs(testSetup.getExecPathString(), COLLECT_COVERAGE, action), + getArgs(COLLECT_COVERAGE, action), env, info, new RunfilesSupplierImpl( 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 f84754f57f..114d60e68b 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 @@ -21,6 +21,7 @@ import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; import com.google.common.io.Closeables; import com.google.devtools.build.lib.actions.ActionExecutionContext; +import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.config.BinTools; @@ -155,21 +156,22 @@ public abstract class TestStrategy implements TestActionContext { * Generates a command line to run for the test action, taking into account coverage and {@code * --run_under} settings. * - * @param testScript the setup script that invokes the test * @param coverageScript a script interjected between setup script and rest of command line to * collect coverage data. If this is an empty string, it is ignored. * @param testAction The test action. * @return the command line as string list. */ - protected List<String> getArgs( - String testScript, String coverageScript, TestRunnerAction testAction) { + protected List<String> getArgs(String coverageScript, TestRunnerAction testAction) + throws ExecException { List<String> args = Lists.newArrayList(); if (OS.getCurrent() == OS.WINDOWS) { args.add(testAction.getShExecutable().getPathString()); args.add("-c"); args.add("$0 $*"); } - args.add(testScript); + + Artifact testSetup = testAction.getRuntimeArtifact(TEST_SETUP_BASENAME); + args.add(testSetup.getExecPathString()); TestTargetExecutionSettings execSettings = testAction.getExecutionSettings(); List<String> execArgs = new ArrayList<>(); |