diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2016-01-20 19:05:34 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2016-01-21 10:32:51 +0000 |
| commit | f14edbb12c800646028638e5a44aa3b93a0165cf (patch) | |
| tree | e2e2c3b6c27186783082431ca1985b4ed66dea83 /src/test/java/com/google | |
| parent | fbb6c6b84810e001d7cc58ed4e5782913e65199b (diff) | |
Rename defaultShellEnvironment to localShellEnvironment and clarify
its intended use.
--
MOS_MIGRATED_REVID=112598772
Diffstat (limited to 'src/test/java/com/google')
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index e0892451aa..7c8c5bca5a 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -84,7 +84,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { return; } - Map<String, String> env = create().getDefaultShellEnvironment(); + Map<String, String> env = create().getLocalShellEnvironment(); assertThat(env).containsEntry("LANG", "en_US"); assertThat(env).containsKey("PATH"); assertThat(env.get("PATH")).contains("/bin:/usr/bin"); diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java index af4cca3f77..553fc5eb2e 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java @@ -238,7 +238,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { MoreAsserts.assertContainsSublist(action.getArguments(), "-c", "dummy_command", "", "--a", "--b"); assertEquals("DummyMnemonic", action.getMnemonic()); assertEquals("dummy_message", action.getProgressMessage()); - assertEquals(targetConfig.getDefaultShellEnvironment(), action.getEnvironment()); + assertEquals(targetConfig.getLocalShellEnvironment(), action.getEnvironment()); } @Test |