diff options
Diffstat (limited to 'src')
12 files changed, 19 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java index 6d0daf8f39..b52bc2f8d7 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java +++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java @@ -269,6 +269,10 @@ public abstract class AbstractAction implements Action, ActionApi { return inputs; } + public final ActionEnvironment getEnvironment() { + return env; + } + @Override public Iterable<String> getClientEnvironmentVariables() { return env.getInheritedEnv(); diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java b/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java index e76fd0723e..e7443e5074 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java +++ b/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java @@ -33,7 +33,7 @@ public interface CommandAction extends Action, ExecutionInfoSpecifier { * method does not provide access to the client environment. */ @VisibleForTesting - ImmutableMap<String, String> getEnvironment(); + ImmutableMap<String, String> getIncompleteEnvironmentForTesting(); /** Returns inputs to this action, including inputs that may be pruned. */ @VisibleForTesting // productionVisibility = Visibility.PRIVATE diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 1ea286db8d..6191b272a8 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -479,7 +479,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie @Override @VisibleForTesting - public final ImmutableMap<String, String> getEnvironment() { + public final ImmutableMap<String, String> getIncompleteEnvironmentForTesting() { // TODO(ulfjack): AbstractAction should declare getEnvironment with a return value of type // ActionEnvironment to avoid developers misunderstanding the purpose of this method. That // requires first updating all subclasses and callers to actually handle environments correctly, diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 3f8045a538..aa89b5ae4e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -746,7 +746,7 @@ public class CppCompileAction extends AbstractAction @Override @VisibleForTesting - public ImmutableMap<String, String> getEnvironment() { + public ImmutableMap<String, String> getIncompleteEnvironmentForTesting() { return getEnvironment(ImmutableMap.of()); } @@ -793,7 +793,7 @@ public class CppCompileAction extends AbstractAction Artifact.toExecPaths(ccCompilationContext.getDeclaredIncludeSrcs())); } // TODO(ulfjack): Extra actions currently ignore the client environment. - for (Map.Entry<String, String> envVariable : getEnvironment().entrySet()) { + for (Map.Entry<String, String> envVariable : getIncompleteEnvironmentForTesting().entrySet()) { info.addVariable( EnvironmentVariable.newBuilder() .setName(envVariable.getKey()) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java index d18aca00e7..4547dbe35e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java @@ -210,7 +210,7 @@ public final class CppLinkAction extends AbstractAction @Override @VisibleForTesting - public ImmutableMap<String, String> getEnvironment() { + public ImmutableMap<String, String> getIncompleteEnvironmentForTesting() { return getEnvironment(ImmutableMap.of()); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java index 6e1679c277..acd5b3bd1b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java @@ -105,7 +105,7 @@ public class ActionGraphDump { SpawnAction spawnAction = (SpawnAction) action; // TODO(twerth): This handles the fixed environment. We probably want to output the inherited // environment as well. - ImmutableMap<String, String> fixedEnvironment = spawnAction.getEnvironment(); + ImmutableMap<String, String> fixedEnvironment = spawnAction.getEnvironment().getFixedEnv(); for (Map.Entry<String, String> environmentVariable : fixedEnvironment.entrySet()) { AnalysisProtos.KeyValuePair.Builder keyValuePairBuilder = AnalysisProtos.KeyValuePair.newBuilder(); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java index 17588a6504..d9cd78d682 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java @@ -240,7 +240,7 @@ public class SpawnActionTemplateTest { assertThat(expandedActions).hasSize(3); for (int i = 0; i < expandedActions.size(); ++i) { - assertThat(expandedActions.get(i).getEnvironment()).containsExactly("env", "value"); + assertThat(expandedActions.get(i).getIncompleteEnvironmentForTesting()).containsExactly("env", "value"); assertThat(expandedActions.get(i).getExecutionInfo()).containsExactly("local", ""); } } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java index 2fdc15f929..017cc1f003 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java @@ -489,7 +489,7 @@ public class SpawnActionTest extends BuildViewTestCase { assertThat(spawnInfo.getInputFileList()).containsExactlyElementsIn(inputPaths); assertThat(spawnInfo.getOutputFileList()).containsExactlyElementsIn(outputPaths); - Map<String, String> environment = action.getEnvironment(); + Map<String, String> environment = action.getIncompleteEnvironmentForTesting(); assertThat(spawnInfo.getVariableCount()).isEqualTo(environment.size()); for (EnvironmentVariable variable : spawnInfo.getVariableList()) { diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 8aaefcc460..fda3b53507 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -281,7 +281,7 @@ public class CppLinkActionTest extends BuildViewTestCase { ImmutableList.<LibraryToLink>of(), featureConfiguration) .build(); - assertThat(linkAction.getEnvironment()).containsEntry("foo", "bar"); + assertThat(linkAction.getIncompleteEnvironmentForTesting()).containsEntry("foo", "bar"); } private enum NonStaticAttributes { diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java index 895a4d9861..2880f76d93 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java @@ -1766,7 +1766,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { ActionsTestUtil.getFirstArtifactEndingWith(cppLibLinkAction.getInputs(), ".o"); CppCompileAction action = (CppCompileAction) getGeneratingAction(cppLibArtifact); - assertAppleSdkVersionEnv(action.getEnvironment()); + assertAppleSdkVersionEnv(action.getIncompleteEnvironmentForTesting()); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 4b72583b21..0783ad2cf3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -396,16 +396,16 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { } protected void assertAppleSdkVersionEnv(CommandAction action, String versionString) { - assertThat(action.getEnvironment()) + assertThat(action.getIncompleteEnvironmentForTesting()) .containsEntry("APPLE_SDK_VERSION_OVERRIDE", versionString); } protected void assertAppleSdkPlatformEnv(CommandAction action, String platformName) { - assertThat(action.getEnvironment()).containsEntry("APPLE_SDK_PLATFORM", platformName); + assertThat(action.getIncompleteEnvironmentForTesting()).containsEntry("APPLE_SDK_PLATFORM", platformName); } protected void assertXcodeVersionEnv(CommandAction action, String versionNumber) { - assertThat(action.getEnvironment()).containsEntry("XCODE_VERSION_OVERRIDE", versionNumber); + assertThat(action.getIncompleteEnvironmentForTesting()).containsEntry("XCODE_VERSION_OVERRIDE", versionNumber); } protected ObjcProvider providerForTarget(String label) throws Exception { 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 a414b32649..2aad0eb709 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 @@ -258,7 +258,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { action.getArguments(), "-c", "dummy_command", "", "--a", "--b"); assertThat(action.getMnemonic()).isEqualTo("DummyMnemonic"); assertThat(action.getProgressMessage()).isEqualTo("dummy_message"); - assertThat(action.getEnvironment()).isEqualTo(targetConfig.getLocalShellEnvironment()); + assertThat(action.getIncompleteEnvironmentForTesting()).isEqualTo(targetConfig.getLocalShellEnvironment()); } @Test @@ -350,7 +350,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { (SpawnAction) Iterables.getOnlyElement( ruleContext.getRuleContext().getAnalysisEnvironment().getRegisteredActions()); - assertThat(action.getEnvironment()).containsExactly("a", "b"); + assertThat(action.getIncompleteEnvironmentForTesting()).containsExactly("a", "b"); // We expect "timeout" to be filtered by TargetUtils. assertThat(action.getExecutionInfo()).containsExactly("block-network", "foo"); } |