aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2016-02-12 14:41:05 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-02-12 15:25:33 +0000
commitdfe2f10e28376407db239f867fb39629b35bf8ad (patch)
treec08ed71ae4f52aab00c6151bb4b207e82e8fc17a /src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
parent0032f17ba372b96201d36ea5716eb994ac3dcf28 (diff)
Windows: execute build-runfiles through shell.
Needed for #276. -- MOS_MIGRATED_REVID=114529775
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
index f0860f8295..6fc354b6ff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
@@ -88,6 +88,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
private final int shardNum;
private final int runNumber;
private final String workspaceName;
+ private final PathFragment shExecutable;
// Mutable state related to test caching.
private boolean checkedCaching = false;
@@ -167,6 +168,7 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
this.undeclaredOutputsAnnotationsPath = undeclaredOutputsAnnotationsDir.getChild("ANNOTATIONS");
this.testInfrastructureFailure = baseDir.getChild(namePrefix + ".infrastructure_failure");
this.workspaceName = workspaceName;
+ this.shExecutable = configuration.getShExecutable();
Map<String, String> mergedTestEnv = new HashMap<>(configuration.getTestEnv());
mergedTestEnv.putAll(extraTestEnv);
@@ -556,6 +558,10 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
throw new UserExecException("'" + basename + "' not found in test runtime");
}
+ public PathFragment getShExecutable() {
+ return shExecutable;
+ }
+
/**
* The same set of paths as the parent test action, resolved against a given exec root.
*/