commit d8d3776b4e960fa64c41cc785ee1423c47ef1081
author laurentlb <laurentlb@google.com> Fri Oct 26 14:08:33 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Oct 26 14:10:34 2018 -0700
tree 3b05783495681525ac93cb57f6a79b04f66a8bb3
parent 9394099d4e14c54cb0c5016bc49c5cd79a9ef427

New flag --incompatible_no_attr_license to disable `attr.license` function

#6420

RELNOTES:
  The function `attr.license` is deprecated and will be removed.
  It can be disabled now with `--incompatible_no_attr_license`.
PiperOrigin-RevId: 218910996

src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
index 9360d94..7fcda27 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -144,6 +144,7 @@
         "--incompatible_expand_directories=" + rand.nextBoolean(),
         "--incompatible_generate_javacommon_source_jar=" + rand.nextBoolean(),
         "--incompatible_new_actions_api=" + rand.nextBoolean(),
+        "--incompatible_no_attr_license=" + rand.nextBoolean(),
         "--incompatible_no_output_attr_default=" + rand.nextBoolean(),
         "--incompatible_no_support_tools_in_action_inputs=" + rand.nextBoolean(),
         "--incompatible_no_target_output_group=" + rand.nextBoolean(),
@@ -188,6 +189,7 @@
         .incompatibleExpandDirectories(rand.nextBoolean())
         .incompatibleGenerateJavaCommonSourceJar(rand.nextBoolean())
         .incompatibleNewActionsApi(rand.nextBoolean())
+        .incompatibleNoAttrLicense(rand.nextBoolean())
         .incompatibleNoOutputAttrDefault(rand.nextBoolean())
         .incompatibleNoSupportToolsInActionInputs(rand.nextBoolean())
         .incompatibleNoTargetOutputGroup(rand.nextBoolean())

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java

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 3337f07..69511a0 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
@@ -644,6 +644,19 @@
   }
 
   @Test
+  public void testNoAttrLicense() throws Exception {
+    ev =
+        createEvaluationTestCase(
+            SkylarkSemantics.DEFAULT_SEMANTICS.toBuilder().incompatibleNoAttrLicense(true).build());
+    ev.initialize();
+
+    EvalException expected = assertThrows(EvalException.class, () -> eval("attr.license()"));
+    assertThat(expected)
+        .hasMessageThat()
+        .contains("type 'attr (a language module)' has no method license()");
+  }
+
+  @Test
   public void testAttrDocValueBadType() throws Exception {
     checkErrorContains(
         "expected value of type 'string' for parameter 'doc', "