diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
5 files changed, 17 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java index c3ae5f91cc..c82b2aeb25 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java @@ -867,7 +867,6 @@ public class RuleClassTest extends PackageLoadingTestCase { name, RuleClassType.NORMAL, /*isSkylark=*/ skylarkExecutable, - skylarkExecutable, /*skylarkTestable=*/ false, documented, publicByDefault, @@ -884,7 +883,9 @@ public class RuleClassTest extends PackageLoadingTestCase { configuredTargetFunction, externalBindingsFunction, /*optionReferenceFunction=*/ RuleClass.NO_OPTION_REFERENCE, - ruleDefinitionEnvironment, + ruleDefinitionEnvironment == null + ? null + : ruleDefinitionEnvironment.getGlobals().getLabel(), ruleDefinitionEnvironmentHashCode, new ConfigurationFragmentPolicy.Builder() .requiresConfigurationFragments(allowedConfigurationFragments) @@ -893,7 +894,7 @@ public class RuleClassTest extends PackageLoadingTestCase { supportsConstraintChecking, /*requiredToolchains=*/ ImmutableSet.<Label>of(), /*supportsPlatforms=*/ true, - attributes); + ImmutableList.copyOf(attributes)); } private static RuleClass createParentRuleClass() { diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java index 7105d917ef..6ce769d074 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java @@ -39,6 +39,7 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleTransitionFactory; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.testutil.Suite; import com.google.devtools.build.lib.testutil.TestSpec; import com.google.devtools.build.lib.util.FileTypeSet; @@ -141,8 +142,9 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest } } - private static class SetsTestFilterFromAttributeTransitionFactory - implements RuleTransitionFactory { + @AutoCodec.VisibleForSerialization + @AutoCodec + static class SetsTestFilterFromAttributeTransitionFactory implements RuleTransitionFactory { @Override public ConfigurationTransition buildTransitionFor(Rule rule) { NonconfigurableAttributeMapper attributes = NonconfigurableAttributeMapper.of(rule); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java index 172ec3964a..458adbff56 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java @@ -183,10 +183,7 @@ public class SkylarkFileContentHashTests extends BuildViewTestCase { Collection<Target> targets = result.get(pkgLookupKey).getPackage().getTargets().values(); for (Target target : targets) { if (target.getName().equals(name)) { - return ((Rule) target) - .getRuleClassObject() - .getRuleDefinitionEnvironment() - .getTransitiveContentHashCode(); + return ((Rule) target).getRuleClassObject().getRuleDefinitionEnvironmentHashCode(); } } throw new IllegalStateException("target not found: " + name); 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 6f6a561d84..b13d64ac8b 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 @@ -484,16 +484,16 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { public void testLabelAttrDefaultValueAsStringBadValue() throws Exception { checkErrorContains( "invalid label '/foo:bar' in parameter 'default' of attribute 'label': " - + "invalid label: /foo:bar", + + "invalid target name '/foo:bar'", "attr.label(default = '/foo:bar')"); checkErrorContains( "invalid label '/bar:foo' in element 1 of parameter 'default' of attribute " - + "'label_list': invalid label: /bar:foo", + + "'label_list': invalid target name '/bar:foo'", "attr.label_list(default = ['//foo:bar', '/bar:foo'])"); checkErrorContains( - "invalid label '/bar:foo' in dict key element: invalid label: /bar:foo", + "invalid label '/bar:foo' in dict key element: invalid target name '/bar:foo'", "attr.label_keyed_string_dict(default = {'//foo:bar': 'a', '/bar:foo': 'b'})"); } 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 b42214062c..38d32e5e29 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 @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.skylark.SkylarkModules; import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.PackageFactory.PackageContext; import com.google.devtools.build.lib.rules.platform.PlatformCommon; @@ -63,7 +64,10 @@ public abstract class SkylarkTestCase extends BuildViewTestCase { Environment.builder(mutability) .useDefaultSemantics() .setEventHandler(getEventHandler()) - .setGlobals(SkylarkModules.getGlobals(modules)) + .setGlobals( + SkylarkModules.getGlobals(modules) + .withLabel( + Label.parseAbsoluteUnchecked("//test:label", /*defaultToMain=*/ false))) .setPhase(Phase.LOADING) .build() .setupDynamic( |