diff options
author | mjhalupka <mjhalupka@google.com> | 2018-02-08 13:29:30 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-08 13:31:21 -0800 |
commit | 0ab46f0dd95f735056add4dd8a90a76944b81d00 (patch) | |
tree | 3597993d68d65ce10c68b5acbfc772599587704a /src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | |
parent | c7f613b0ede0efd977065d1fc190d2a67eb3148e (diff) |
Remove references to getTarget(). Requires threading through an
ExtendedEventHandler so we can get the target via the package manager during
rule dumps.
PiperOrigin-RevId: 185042522
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 479cde386d..153e976c8d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -1193,8 +1193,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { packageRelativePath, owner .getConfiguration() - .getGenfilesDirectory( - owner.getTarget().getLabel().getPackageIdentifier().getRepository()), + .getGenfilesDirectory(owner.getLabel().getPackageIdentifier().getRepository()), (AspectValue.AspectKey) AspectValue.createAspectKey( owner.getLabel(), @@ -1973,7 +1972,13 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ConfiguredTarget target, BuildConfiguration configuration, SafeImplicitOutputsFunction outputFunction) { - Rule associatedRule = target.getTarget().getAssociatedRule(); + Rule rule; + try { + rule = (Rule) skyframeExecutor.getPackageManager().getTarget(reporter, target.getLabel()); + } catch (NoSuchPackageException | NoSuchTargetException | InterruptedException e) { + throw new IllegalStateException(e); + } + Rule associatedRule = rule.getAssociatedRule(); RepositoryName repository = associatedRule.getRepository(); ArtifactRoot root; @@ -1982,15 +1987,13 @@ public abstract class BuildViewTestCase extends FoundationTestCase { } else { root = configuration.getGenfilesDirectory(repository); } - ArtifactOwner owner = - ConfiguredTargetKey.of(target.getTarget().getLabel(), target.getConfiguration()); + ArtifactOwner owner = ConfiguredTargetKey.of(target.getLabel(), target.getConfiguration()); RawAttributeMapper attr = RawAttributeMapper.of(associatedRule); String path = Iterables.getOnlyElement(outputFunction.getImplicitOutputs(eventCollector, attr)); return view.getArtifactFactory() - .getDerivedArtifact( - target.getTarget().getLabel().getPackageFragment().getRelative(path), root, owner); + .getDerivedArtifact(target.getLabel().getPackageFragment().getRelative(path), root, owner); } } |