diff options
| author |  Googler <noreply@google.com> | 2018-04-30 07:53:13 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-30 07:57:30 -0700 |
| commit | 3e50e3565b1d39a8ab82d817bca9bc2eb3ca8fc1 (patch) | |
| tree | cc3f392f17e4fb59adafc133ef683f8f38e8d59b /src/main/java/com | |
| parent | b083de868ff2dab43ef2fed111aa860aed0f73c8 (diff) | |
Make runfiles usage on Windows more flexible to support remote execution.
When trying to find a runfile on Windows:
1. First look for the runfiles MANIFEST and find runfile locations using this if it exists (current behavior).
2. If no MANIFEST file exists, look for runfiles in the runfiles directory (new behavior).
As part of this, remove setting RUNFILES_MANIFEST_ONLY for the benefit of test-setup.sh. Instead of telling it what to do, it decides what to do based on the observed state of the world. Launchers still set RUNFILES_MANIFEST_ONLY for the benefit of launched programs, since some may depend on this.
Fixes https://github.com/bazelbuild/bazel/issues/4962.
RELNOTES: Remote execution works for Windows binaries with launchers.
PiperOrigin-RevId: 194785440
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java index eb754bdbf4..16f15b5f9a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java @@ -508,11 +508,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa } env.put("XML_OUTPUT_FILE", getXmlOutputPath().getPathString()); - if (!isEnableRunfiles()) { - // If runfiles are disabled, tell remote-runtest.sh/local-runtest.sh about that. - env.put("RUNFILES_MANIFEST_ONLY", "1"); - } - if (isCoverageMode()) { // Instruct remote-runtest.sh/local-runtest.sh not to cd into the runfiles directory. // TODO(ulfjack): Find a way to avoid setting this variable. |