Set default value of incompatible_load_argument_is_label to true.

RELNOTES:
  First argument of 'load' must be a label. Path syntax is removed.
  (label should start with '//' or ':').
PiperOrigin-RevId: 177802628

5 files changed, 28 insertions, 25 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java
index 4c67a880f5..e1235735bc 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java
@@ -1055,8 +1055,9 @@ public class ConfigurableAttributesTest extends BuildViewTestCase {
         ")");
     scratch.file("test/BUILD",
         "genrule(name = \"foo\", srcs = [], outs = [\"foo.out\"], cmd = \"\")");
-    scratch.file("foo/BUILD",
-        "load(\"/test/selector_rules\", \"selector_rule\")",
+    scratch.file(
+        "foo/BUILD",
+        "load('//test:selector_rules.bzl', \"selector_rule\")",
         "selector_rule(",
         "    name = \"rule\",",
         "    out_file = \"rule.out\",",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
index f92adf919d..15d7db9a2b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
@@ -41,7 +41,7 @@ public final class BuildConfigurationSkylarkTest extends BuildViewTestCase {
     scratch.file(
         "examples/config_skylark/BUILD",
         "package(default_visibility = ['//visibility:public'])",
-        "load('/examples/rule/config_test', 'test_rule')",
+        "load('//examples/rule:config_test.bzl', 'test_rule')",
         "test_rule(",
         "    name = 'my_target',",
         ")");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
index 0622eebc05..6ffd13cecc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
@@ -370,7 +370,7 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
         ")");
     scratch.file(
         "proto/BUILD",
-        "load('/proto/extensions', 'custom_rule')",
+        "load('//proto:extensions.bzl', 'custom_rule')",
         "load('//tools/build_rules/java_lite_proto_library:java_lite_proto_library.bzl',",
         "      'java_lite_proto_library')",
         "proto_library(",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
index d71a7f333b..9d73fc810f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
@@ -117,7 +117,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   public void testLoadRelativePath() throws Exception {
     scratch.file("pkg/BUILD");
     scratch.file("pkg/ext1.bzl", "a = 1");
-    scratch.file("pkg/ext2.bzl", "load('ext1', 'a')");
+    scratch.file("pkg/ext2.bzl", "load(':ext1.bzl', 'a')");
     get(key("//pkg:ext2.bzl"));
   }
 
@@ -126,7 +126,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
     scratch.file("pkg2/BUILD");
     scratch.file("pkg3/BUILD");
     scratch.file("pkg2/ext.bzl", "b = 1");
-    scratch.file("pkg3/ext.bzl", "load('/pkg2/ext', 'b')");
+    scratch.file("pkg3/ext.bzl", "load('//pkg2:ext.bzl', 'b')");
     get(key("//pkg3:ext.bzl"));
   }
 
@@ -135,7 +135,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
     scratch.file("pkg1/BUILD");
     scratch.file("pkg2/BUILD");
     scratch.file("pkg1/ext.bzl", "a = 1", "b = 2");
-    scratch.file("pkg2/ext.bzl", "load('/pkg1/ext', 'a')", "load('/pkg1/ext', 'b')");
+    scratch.file("pkg2/ext.bzl", "load('//pkg1:ext.bzl', 'a')", "load('//pkg1:ext.bzl', 'b')");
     get(key("//pkg2:ext.bzl"));
   }
 
@@ -143,7 +143,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   public void testLoadFromSameRelativePathTwice() throws Exception {
     scratch.file("pkg/BUILD");
     scratch.file("pkg/ext1.bzl", "a = 1", "b = 2");
-    scratch.file("pkg/ext2.bzl", "load('ext1', 'a')", "load('ext1', 'b')");
+    scratch.file("pkg/ext2.bzl", "load(':ext1.bzl', 'a')", "load(':ext1.bzl', 'b')");
     get(key("//pkg:ext2.bzl"));
   }
 
@@ -151,7 +151,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   public void testLoadFromRelativePathInSubdir() throws Exception {
     scratch.file("pkg/BUILD");
     scratch.file("pkg/subdir/ext1.bzl", "a = 1");
-    scratch.file("pkg/subdir/ext2.bzl", "load('ext1', 'a')");
+    scratch.file("pkg/subdir/ext2.bzl", "load(':subdir/ext1.bzl', 'a')");
     get(key("//pkg:subdir/ext2.bzl"));
   }
 
@@ -200,7 +200,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   public void testSkylarkImportLookupNoBuildFileForLoad() throws Exception {
     scratch.file("pkg2/BUILD");
     scratch.file("pkg1/ext.bzl", "a = 1");
-    scratch.file("pkg2/ext.bzl", "load('/pkg1/ext', 'a')");
+    scratch.file("pkg2/ext.bzl", "load('//pkg1:ext.bzl', 'a')");
     SkyKey skylarkImportLookupKey =
         SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
     EvaluationResult<SkylarkImportLookupValue> result =
@@ -216,21 +216,23 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   }
 
   @Test
-  public void testSkylarkAbsoluteImportFilenameWithControlChars() throws Exception {
+  public void testSkylarkImportFilenameWithControlChars() throws Exception {
     scratch.file("pkg/BUILD", "");
-    scratch.file("pkg/ext.bzl", "load('/pkg/oops\u0000', 'a')");
-    SkyKey skylarkImportLookupKey =
-        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
-    EvaluationResult<SkylarkImportLookupValue> result =
-        SkyframeExecutorTestUtils.evaluate(
-            getSkyframeExecutor(), skylarkImportLookupKey, /*keepGoing=*/ false, reporter);
-    assertThat(result.hasError()).isTrue();
-    ErrorInfo errorInfo = result.getError(skylarkImportLookupKey);
-    String errorMessage = errorInfo.getException().getMessage();
-    assertThat(errorMessage)
-        .isEqualTo(
-            "invalid target name 'oops<?>.bzl': "
-                + "target names may not contain non-printable characters: '\\x00'");
+    scratch.file("pkg/ext.bzl", "load('//pkg:oops\u0000.bzl', 'a')");
+    try {
+      SkyKey skylarkImportLookupKey =
+          SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
+      EvaluationResult<SkylarkImportLookupValue> result =
+          SkyframeExecutorTestUtils.evaluate(
+              getSkyframeExecutor(), skylarkImportLookupKey, /*keepGoing=*/ false, reporter);
+      fail("Expected exception");
+    } catch (AssertionError e) {
+      String errorMessage = e.getMessage();
+      assertThat(errorMessage)
+          .contains(
+              "invalid target name 'oops<?>.bzl': "
+              + "target names may not contain non-printable characters: '\\x00'");
+    }
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
index 8039563a44..bd383d463b 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -934,7 +934,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
 
     scratch.file(
         "test/skylark/BUILD",
-        "load('/test/skylark/extension', 'custom_rule')",
+        "load('//test/skylark:extension.bzl', 'custom_rule')",
         "",
         "custom_rule(name = 'cr')");