diff options
author | gregce <gregce@google.com> | 2018-01-29 15:01:20 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-29 15:02:53 -0800 |
commit | 207f4bdc9cc08e53592d0961867fe9b9bd82cc54 (patch) | |
tree | dd7966f1fcfb23355ee59c5bb73d0eaa58f99ed8 /src/test/java/com/google/devtools/build/lib/skylark | |
parent | 016a42bc5e6368fb34a52394e93058348c4ef1a3 (diff) |
Remove Skylark ConfigurationTransition.DATA references.
PiperOrigin-RevId: 183733621
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skylark')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java index 58dfecfc4e..0524bb3b9a 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransitionProxy; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; import com.google.devtools.build.lib.analysis.skylark.SkylarkAttr; import com.google.devtools.build.lib.analysis.skylark.SkylarkAttr.Descriptor; @@ -46,6 +45,7 @@ import com.google.devtools.build.lib.packages.SkylarkDefinedAspect; import com.google.devtools.build.lib.packages.SkylarkInfo; import com.google.devtools.build.lib.packages.SkylarkProvider; import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier; +import com.google.devtools.build.lib.rules.cpp.transitions.DisableLipoTransition; import com.google.devtools.build.lib.skyframe.SkylarkImportLookupFunction; import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; import com.google.devtools.build.lib.syntax.BuildFileAST; @@ -540,7 +540,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { @Test public void testAttrCfgData() throws Exception { Attribute attr = buildAttribute("a1", "attr.label(cfg = 'data', allow_files = True)"); - assertThat(attr.getConfigurationTransition()).isEqualTo(ConfigurationTransitionProxy.DATA); + assertThat(attr.getConfigurationTransition()).isEqualTo(DisableLipoTransition.INSTANCE); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java index a442f7cbb4..b42214062c 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java @@ -72,6 +72,7 @@ public abstract class SkylarkTestCase extends BuildViewTestCase { // create rules. Creating actual rules is tested in SkylarkIntegrationTest. new PackageContext(null, null, getEventHandler(), null)); SkylarkUtils.setToolsRepository(env, TestConstants.TOOLS_REPOSITORY); + SkylarkUtils.setLipoDataTransition(env, ruleClassProvider.getLipoDataTransition()); return env; } }; |