diff options
author | ulfjack <ulfjack@google.com> | 2018-03-21 15:50:39 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-21 15:52:35 -0700 |
commit | 0f5679ef95611e457a6e39313cf88feac8b2278f (patch) | |
tree | aabde122dacbf4982edd470089c3335b29c4505e /src/test/java/com/google/devtools/build | |
parent | 9c4cecde70df9b532612d0be295ad27581c4c3a6 (diff) |
Use PATH and LD_LIBRARY_PATH from the client's environment if possible
This is technically an incompatible change, but I think it's unlikely to affect a lot of users. Note that this change leaves out Windows, where we set the PATH to the server env PATH plus the MSYS root determined from the shell path.
This is a cleanup, and it also makes unknown commit slightly safer.
PiperOrigin-RevId: 189981959
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/bazel/rules/BazelConfigurationTest.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelConfigurationTest.java index 5e41e35191..f4ce424f9e 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/BazelConfigurationTest.java @@ -67,14 +67,13 @@ public class BazelConfigurationTest { @Test public void pathOrDefaultOnLinux() { assertThat(pathOrDefault(OS.LINUX, null, null)).isEqualTo("/bin:/usr/bin"); - assertThat(pathOrDefault(OS.LINUX, "/not/bin", null)).isEqualTo("/not/bin"); + assertThat(pathOrDefault(OS.LINUX, "/not/bin", null)).isEqualTo("/bin:/usr/bin"); } @Test public void pathOrDefaultOnWindows() { - assertThat(pathOrDefault(OS.WINDOWS, null, null)).isEqualTo(""); - assertThat(pathOrDefault(OS.WINDOWS, "C:/mypath", null)) - .isEqualTo("C:/mypath"); + assertThat(pathOrDefault(OS.WINDOWS, null, null)).isNull(); + assertThat(pathOrDefault(OS.WINDOWS, "C:/mypath", null)).isNull(); assertThat(pathOrDefault(OS.WINDOWS, "C:/mypath", PathFragment.create("D:/foo/shell"))) .isEqualTo("D:\\foo;C:/mypath"); } |