diff options
| author |  Adam Michael <ajmichael@google.com> | 2017-01-17 20:06:09 +0000 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-01-18 11:01:13 +0000 |
| commit | 7618bbd08f57a4c4996bcdd2d3472261d4a573e9 (patch) | |
| tree | 5fc9d2579ac971a9d3ce73b2d0452a164430dc76 /src/main/java/com/google | |
| parent | 4ec02263fa630e97ce9a749a02efe9cf64838690 (diff) | |
Description redacted.
--
PiperOrigin-RevId: 144739068
MOS_MIGRATED_REVID=144739068
Diffstat (limited to 'src/main/java/com/google')
3 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java b/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java index a7723f7b8e..dd2d5de509 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java +++ b/src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java @@ -218,17 +218,15 @@ public class BaseSpawn implements Spawn { PathFragment runfilesRoot = getRunfilesRoot(); if (runfilesRoot == null || (environment.containsKey("JAVA_RUNFILES") - && environment.containsKey("PYTHON_RUNFILES") - && environment.containsKey("RUNFILES_DIR"))) { + && environment.containsKey("PYTHON_RUNFILES"))) { return environment; } else { ImmutableMap.Builder<String, String> env = ImmutableMap.builder(); env.putAll(environment); - // TODO(bazel-team): Remove JAVA_RUNFILES and PYTHON_RUNFILES. + // TODO(bazel-team): Unify these into a single env variable. String runfilesRootString = runfilesRoot.getPathString(); env.put("JAVA_RUNFILES", runfilesRootString); env.put("PYTHON_RUNFILES", runfilesRootString); - env.put("RUNFILES_DIR", runfilesRootString); return env.build(); } } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt index 55f0e7e488..04316fea4d 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt @@ -105,7 +105,6 @@ def Main(): python_path += separator + old_python_path new_env['PYTHONPATH'] = python_path - new_env['RUNFILES_DIR'] = module_space # Now look for my main python source file. # The magic string percent-main-percent is replaced with the filename of the 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 b444544ca6..9b2e1d3ab8 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 @@ -248,7 +248,6 @@ public class StandaloneTestStrategy extends TestStrategy { String testSrcDir = runfilesDir.relativeTo(execRoot).getPathString(); env.put("JAVA_RUNFILES", testSrcDir); env.put("PYTHON_RUNFILES", testSrcDir); - env.put("RUNFILES_DIR", testSrcDir); env.put("TEST_SRCDIR", testSrcDir); env.put("TEST_TMPDIR", tmpDirString); env.put("TEST_WORKSPACE", action.getRunfilesPrefix()); |