diff options
| author |  janakr <janakr@google.com> | 2018-06-08 12:51:58 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-08 12:53:15 -0700 |
| commit | 45b308a62f42c2c0bcfe79dcd4046c4025a31059 (patch) | |
| tree | 176fc0a10fa37906864e952d833966298ccab727 /src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java | |
| parent | c44a87b0736c671e07e62f8b09c8e61775543ded (diff) | |
Make Artifact#equals take the owner into account for derived artifacts.
Derived artifacts' owners are important because they are used to determine the artifact's generating action. Source artifacts' owners are not used in this way, so I left them alone.
This allows us to get rid of most uses of ArtifactSkyKey. We may be able to delete it entirely in a follow-up.
PiperOrigin-RevId: 199836436
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 ef300318ac..4da1ada195 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 @@ -89,7 +89,7 @@ public final class ActionTemplateExpansionFunctionTest extends FoundationTestCas MemoizingEvaluator evaluator = new InMemoryMemoizingEvaluator( ImmutableMap.<SkyFunctionName, SkyFunction>builder() - .put(SkyFunctions.ARTIFACT, new DummyArtifactFunction(artifactValueMap)) + .put(Artifact.ARTIFACT, new DummyArtifactFunction(artifactValueMap)) .put( SkyFunctions.ACTION_TEMPLATE_EXPANSION, new ActionTemplateExpansionFunction( @@ -264,9 +264,7 @@ public final class ActionTemplateExpansionFunctionTest extends FoundationTestCas } @Override public SkyValue compute(SkyKey skyKey, Environment env) { - ArtifactSkyKey artifactSkyKey = (ArtifactSkyKey) skyKey.argument(); - Artifact artifact = artifactSkyKey.getArtifact(); - return Preconditions.checkNotNull(artifactValueMap.get(artifact)); + return Preconditions.checkNotNull(artifactValueMap.get(skyKey)); } @Override |