aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/RuleClass.java5
-rw-r--r--src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index d838923691..75fd947223 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -766,8 +766,9 @@ public class RuleClass {
// Only rules that allow per target execution constraints need this attribute.
Preconditions.checkState(
!this.attributes.containsKey("exec_compatible_with"),
- "Rule should not already define the attribute \"exec_compatible_with\""
- + " if executionPlatformConstraintsAllowed is set to PER_TARGET");
+ "Rule %s should not already define the attribute \"exec_compatible_with\""
+ + " because executionPlatformConstraintsAllowed is set to PER_TARGET",
+ key);
this.add(
attr("exec_compatible_with", BuildType.LABEL_LIST)
.allowedFileTypes()
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 dc1a170f40..5a68334bba 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
@@ -1667,7 +1667,9 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase {
" toolchains=['//test:my_toolchain_type'],",
" execution_platform_constraints_allowed=True,",
")");
- ev.assertContainsError("Rule should not already define the attribute \"exec_compatible_with\"");
+ ev.assertContainsError(
+ "Rule //fake/label.bzl:label.bzl%r1 should not already"
+ + " define the attribute \"exec_compatible_with\"");
}
@Test