diff options
| author |  janakr <janakr@google.com> | 2018-03-27 14:38:52 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-27 14:41:06 -0700 |
| commit | cc3890d72713007d2f0c07be0f64a8e9fb185a1f (patch) | |
| tree | d3ffdec11c53a200f1b2bc95837e860e1cb6744f /src/test/java/com | |
| parent | 931c18258802c1036396e8f6c93ac109409b3185 (diff) | |
Remove ConfiguredTargetKey#of(ConfiguredTarget), since it calls ConfiguredTarget#getConfiguration.
PiperOrigin-RevId: 190676253
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 6c7f29319a..8205af49d7 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -476,7 +476,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { .getDerivedArtifact( label.getPackageFragment().getRelative(packageRelativePath), getTargetConfiguration().getBinDirectory(label.getPackageIdentifier().getRepository()), - ConfiguredTargetKey.of(owner)); + ConfiguredTargetKey.of( + owner, skyframeExecutor.getConfiguration(reporter, owner.getConfigurationKey()))); } protected Set<SkyKey> getSkyframeEvaluatedTargetKeys() { 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 bcad79f2f6..7d394a78e1 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 @@ -1124,7 +1124,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { return getPackageRelativeDerivedArtifact( packageRelativePath, owner.getConfiguration().getBinDirectory(RepositoryName.MAIN), - ConfiguredTargetKey.of(owner)); + ConfiguredTargetKey.of( + owner, skyframeExecutor.getConfiguration(reporter, owner.getConfigurationKey()))); } /** @@ -1200,8 +1201,10 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * just be "foo.o". */ protected Artifact getGenfilesArtifact(String packageRelativePath, ConfiguredTarget owner) { - ConfiguredTargetKey configKey = ConfiguredTargetKey.of(owner); - return getGenfilesArtifact(packageRelativePath, configKey, owner.getConfiguration()); + BuildConfiguration configuration = + skyframeExecutor.getConfiguration(reporter, owner.getConfigurationKey()); + ConfiguredTargetKey configKey = ConfiguredTargetKey.of(owner, configuration); + return getGenfilesArtifact(packageRelativePath, configKey, configuration); } /** @@ -1283,7 +1286,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { return getDerivedArtifact( PathFragment.create(rootRelativePath), targetConfig.getBinDirectory(RepositoryName.MAIN), - ConfiguredTargetKey.of(owner)); + ConfiguredTargetKey.of( + owner, skyframeExecutor.getConfiguration(reporter, owner.getConfigurationKey()))); } protected Action getGeneratingActionForLabel(String label) throws Exception { |