diff options
author | 2018-07-13 00:52:17 -0700 | |
---|---|---|
committer | 2018-07-13 00:53:50 -0700 | |
commit | 75bc18a6290f9112077884460d61f34bec325814 (patch) | |
tree | bdf837d9c727acd915c8cf7c9a316cd8515f5348 /src/test/java/com/google/devtools | |
parent | b39c69394c5e7991ca8d04efac2142c22947a7c5 (diff) |
For all top-level artifacts, track the labels that own them when that is available.
The owning labels are the labels of the top-level configured targets that requested this artifact to be built (there may be many such targets). In cases where the artifact is added not through a configured target (build-info artifacts and coverage artifacts), the label of the artifact's owner is used.
PiperOrigin-RevId: 204432951
Diffstat (limited to 'src/test/java/com/google/devtools')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java index 7ecbba6163..69bbadec8d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java @@ -614,7 +614,7 @@ public class AspectTest extends AnalysisTestCase { // Get owners of all extra-action artifacts. List<Label> extraArtifactOwners = new ArrayList<>(); - for (Artifact artifact : analysisResult.getAdditionalArtifactsToBuild()) { + for (Artifact artifact : analysisResult.getTopLevelArtifactsToOwnerLabels().keySet()) { if (artifact.getRootRelativePathString().endsWith(".xa")) { extraArtifactOwners.add(artifact.getOwnerLabel()); } @@ -628,7 +628,7 @@ public class AspectTest extends AnalysisTestCase { // Get owners of all extra-action artifacts. List<Label> extraArtifactOwners = new ArrayList<>(); - for (Artifact artifact : analysisResult.getAdditionalArtifactsToBuild()) { + for (Artifact artifact : analysisResult.getTopLevelArtifactsToOwnerLabels().keySet()) { if (artifact.getRootRelativePathString().endsWith(".xa")) { extraArtifactOwners.add(artifact.getOwnerLabel()); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 471c742ba6..1d635c02b3 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -1270,7 +1270,7 @@ public class BuildViewTest extends BuildViewTestBase { AnalysisResult analysisResult = update("//x:a"); List<String> owners = new ArrayList<>(); - for (Artifact artifact : analysisResult.getAdditionalArtifactsToBuild()) { + for (Artifact artifact : analysisResult.getTopLevelArtifactsToOwnerLabels().keySet()) { if ("xa".equals(artifact.getExtension())) { owners.add(artifact.getOwnerLabel().toString()); } diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java index 42f09f04a6..7de706c6ba 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java @@ -1790,7 +1790,7 @@ public class SkylarkDefinedAspectsTest extends AnalysisTestCase { "//test:xxx"); assertThat( Iterables.transform( - analysisResult.getAdditionalArtifactsToBuild(), Artifact::getFilename)) + analysisResult.getTopLevelArtifactsToOwnerLabels().keySet(), Artifact::getFilename)) .contains("file.xa"); } |