Update tests to use the label-based load() syntax.
RELNOTES: None.
PiperOrigin-RevId: 177487913
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index a8c2316..8773d54 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -428,10 +428,10 @@
@Test
public void testTransitiveSkylarkDepsStoredInPackage() throws Exception {
scratch.file("foo/BUILD",
- "load('/bar/ext', 'a')");
+ "load('//bar:ext.bzl', 'a')");
scratch.file("bar/BUILD");
scratch.file("bar/ext.bzl",
- "load('/baz/ext', 'b')",
+ "load('//baz:ext.bzl', 'b')",
"a = b");
scratch.file("baz/BUILD");
scratch.file("baz/ext.bzl",
@@ -448,7 +448,7 @@
Label.parseAbsolute("//bar:ext.bzl"), Label.parseAbsolute("//baz:ext.bzl"));
scratch.overwriteFile("bar/ext.bzl",
- "load('/qux/ext', 'c')",
+ "load('//qux:ext.bzl', 'c')",
"a = c");
getSkyframeExecutor().invalidateFilesUnderPathForTesting(
reporter,
@@ -464,7 +464,7 @@
public void testNonExistingSkylarkExtension() throws Exception {
reporter.removeHandler(failFastHandler);
scratch.file("test/skylark/BUILD",
- "load('/test/skylark/bad_extension', 'some_symbol')",
+ "load('//test/skylark:bad_extension.bzl', 'some_symbol')",
"genrule(name = gr,",
" outs = ['out.txt'],",
" cmd = 'echo hello >@')");
@@ -486,10 +486,10 @@
public void testNonExistingSkylarkExtensionFromExtension() throws Exception {
reporter.removeHandler(failFastHandler);
scratch.file("test/skylark/extension.bzl",
- "load('/test/skylark/bad_extension', 'some_symbol')",
+ "load('//test/skylark:bad_extension.bzl', 'some_symbol')",
"a = 'a'");
scratch.file("test/skylark/BUILD",
- "load('/test/skylark/extension', 'a')",
+ "load('//test/skylark:extension.bzl', 'a')",
"genrule(name = gr,",
" outs = ['out.txt'],",
" cmd = 'echo hello >@')");
@@ -512,7 +512,7 @@
Path extensionFilePath = scratch.resolve("/workspace/test/skylark/extension.bzl");
FileSystemUtils.ensureSymbolicLink(extensionFilePath, PathFragment.create("extension.bzl"));
scratch.file("test/skylark/BUILD",
- "load('/test/skylark/extension', 'a')",
+ "load('//test/skylark:extension.bzl', 'a')",
"genrule(name = gr,",
" outs = ['out.txt'],",
" cmd = 'echo hello >@')");
@@ -546,7 +546,7 @@
@Test
public void testLoadRelativePath() throws Exception {
- scratch.file("pkg/BUILD", "load('ext', 'a')");
+ scratch.file("pkg/BUILD", "load(':ext.bzl', 'a')");
scratch.file("pkg/ext.bzl", "a = 1");
validPackage(PackageValue.key(PackageIdentifier.parse("@//pkg")));
}
@@ -555,7 +555,7 @@
public void testLoadAbsolutePath() throws Exception {
scratch.file("pkg1/BUILD");
scratch.file("pkg2/BUILD",
- "load('/pkg1/ext', 'a')");
+ "load('//pkg1:ext.bzl', 'a')");
scratch.file("pkg1/ext.bzl", "a = 1");
validPackage(PackageValue.key(PackageIdentifier.parse("@//pkg2")));
}
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 ee996e0..bbf3489 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
@@ -55,22 +55,22 @@
scratch.file(
"foo/ext.bzl",
- "load('/helper/ext', 'rule_impl')",
+ "load('//helper:ext.bzl', 'rule_impl')",
"",
"foo1 = rule(implementation = rule_impl)",
"foo2 = rule(implementation = rule_impl)");
scratch.file(
"bar/ext.bzl",
- "load('/helper/ext', 'rule_impl')",
+ "load('//helper:ext.bzl', 'rule_impl')",
"",
"bar1 = rule(implementation = rule_impl)");
scratch.file(
"pkg/BUILD",
- "load('/foo/ext', 'foo1')",
- "load('/foo/ext', 'foo2')",
- "load('/bar/ext', 'bar1')",
+ "load('//foo:ext.bzl', 'foo1')",
+ "load('//foo:ext.bzl', 'foo2')",
+ "load('//bar:ext.bzl', 'bar1')",
"",
"foo1(name = 'foo1')",
"foo2(name = 'foo2')",
@@ -87,7 +87,7 @@
String bar1 = getHash("pkg", "bar1");
scratch.overwriteFile(
"bar/ext.bzl",
- "load('/helper/ext', 'rule_impl')",
+ "load('//helper:ext.bzl', 'rule_impl')",
"",
"bar1 = rule(implementation = rule_impl)");
invalidatePackages();
@@ -109,7 +109,7 @@
String bar1 = getHash("pkg", "bar1");
scratch.overwriteFile(
"bar/ext.bzl",
- "load('/helper/ext', 'rule_impl')",
+ "load('//helper:ext.bzl', 'rule_impl')",
"# Some comments to change file hash",
"",
"bar1 = rule(implementation = rule_impl)");
@@ -139,7 +139,7 @@
String foo2 = getHash("pkg", "foo2");
scratch.overwriteFile(
"bar/ext.bzl",
- "load('/helper/ext', 'rule_impl')",
+ "load('//helper:ext.bzl', 'rule_impl')",
"# Some comments to change file hash",
"",
"bar1 = rule(implementation = rule_impl)");
