diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 9 |
1 files changed, 2 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 601882c5b0..d2b83f4834 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 @@ -1465,12 +1465,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { return Iterables.getOnlyElement(masterConfig.getTargetConfigurations()); } - protected BuildConfiguration getDataConfiguration() { - BuildConfiguration targetConfig = getTargetConfiguration(); - // TODO(bazel-team): do a proper data transition for dynamic configurations. - return targetConfig.useDynamicConfigurations() - ? targetConfig - : targetConfig.getConfiguration(ConfigurationTransition.DATA); + protected BuildConfiguration getDataConfiguration() throws InterruptedException { + return getConfiguration(getTargetConfiguration(), ConfigurationTransition.DATA); } protected BuildConfiguration getHostConfiguration() { @@ -1500,7 +1496,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase { /** * Returns an attribute value retriever for the given rule for the target configuration. - */ protected AttributeMap attributes(RuleConfiguredTarget ct) { return ConfiguredAttributeMapper.of(ct); |