From e2d200f32a7242898a5c976837bd3b8e6dfed62c Mon Sep 17 00:00:00 2001 From: cparsons Date: Tue, 6 Mar 2018 16:15:11 -0800 Subject: Expose an actions provider on RuleConfiguredTarget instances. Given a target (for example from a skylark aspect), one will be able to access a list of actions that the target generated using "target.actions". This is without additional memory footprint. Actions themselves are not fully exposed to skylark (and thus there isn't much meaning to gather from them in skylark yet). Access methods will follow soon. RELNOTES: None. PiperOrigin-RevId: 188098079 --- .../build/lib/skyframe/ActionTemplateExpansionFunctionTest.java | 2 +- .../com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java | 3 ++- .../google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 3 ++- .../devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java | 2 +- .../google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/skyframe') diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java index ba1a3c2e3b..9703fb466f 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java @@ -219,7 +219,7 @@ public final class ActionTemplateExpansionFunctionTest extends FoundationTestCas private static ConfiguredTargetValue createConfiguredTargetValue( ActionTemplate actionTemplate) { - return new ConfiguredTargetValue( + return new NonRuleConfiguredTargetValue( Mockito.mock(ConfiguredTarget.class), Actions.GeneratingActions.fromSingleAction(actionTemplate), NestedSetBuilder.stableOrder().build(), diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java index 8a4f3af2e1..2fa5749af0 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.actions.ArtifactRoot; +import com.google.devtools.build.lib.actions.BasicActionLookupValue; import com.google.devtools.build.lib.actions.MissingInputFileException; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; @@ -324,7 +325,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { differencer.inject( ImmutableMap.of( ALL_OWNER, - new ActionLookupValue( + new BasicActionLookupValue( Actions.filterSharedActionsAndThrowActionConflict( actionKeyContext, ImmutableList.copyOf(actions)), false))); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 40c74d0bab..33485277c7 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -41,6 +41,7 @@ import com.google.devtools.build.lib.actions.ActionResult; import com.google.devtools.build.lib.actions.Actions; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactRoot; +import com.google.devtools.build.lib.actions.BasicActionLookupValue; import com.google.devtools.build.lib.actions.BuildFailedException; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; @@ -242,7 +243,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { differencer.inject( ImmutableMap.of( ACTION_LOOKUP_KEY, - new ActionLookupValue( + new BasicActionLookupValue( Actions.filterSharedActionsAndThrowActionConflict( actionKeyContext, ImmutableList.copyOf(actions)), false))); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java index 702929be47..ae3562635a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java @@ -46,7 +46,7 @@ public class ToolchainResolutionFunctionTest extends ToolchainTestCase { private static ConfiguredTargetValue createConfiguredTargetValue( ConfiguredTarget configuredTarget) { - return new ConfiguredTargetValue( + return new NonRuleConfiguredTargetValue( configuredTarget, GeneratingActions.EMPTY, NestedSetBuilder.emptySet(Order.STABLE_ORDER), diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java index 7a804e44d2..47ca57b142 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java @@ -33,6 +33,7 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.actions.ArtifactRoot; +import com.google.devtools.build.lib.actions.BasicActionLookupValue; import com.google.devtools.build.lib.actions.MissingInputFileException; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.actions.cache.DigestUtils; @@ -228,7 +229,7 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase { differencer.inject( ImmutableMap.of( ALL_OWNER, - new ActionLookupValue( + new BasicActionLookupValue( Actions.filterSharedActionsAndThrowActionConflict( actionKeyContext, ImmutableList.copyOf(actions)), false))); -- cgit v1.2.3