diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
2 files changed, 10 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java index ac43486829..6505d0e94b 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java @@ -49,7 +49,10 @@ public abstract class AbstractPackageLoaderTest { Reporter reporter = new Reporter(new EventBus()); handler = new StoredEventHandler(); reporter.addHandler(handler); - pkgLoader = makeFreshBuilder(pkgRoot).setReporter(reporter).build(); + pkgLoader = makeFreshBuilder(pkgRoot) + .useDefaultSkylarkSemantics() + .setReporter(reporter) + .build(); } protected abstract AbstractPackageLoader.Builder makeFreshBuilder(Path pkgRoot); diff --git a/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java b/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java index 946ece8cee..b5522a0007 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.skyframe.PackageFunction; import com.google.devtools.build.lib.skyframe.packages.BazelPackageLoader; import com.google.devtools.build.lib.skyframe.packages.PackageLoader; +import com.google.devtools.build.lib.syntax.SkylarkSemantics; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; @@ -46,8 +47,8 @@ public class BazelPackageBuilderHelperForTesting implements Package.Builder.Help } @Override - public void onLoadingComplete(Package pkg) { - sanityCheckBazelPackageLoader(pkg, ruleClassProvider); + public void onLoadingComplete(Package pkg, SkylarkSemantics skylarkSemantics) { + sanityCheckBazelPackageLoader(pkg, ruleClassProvider, skylarkSemantics); } private static final Function<Target, Label> TARGET_TO_LABEL = @@ -61,7 +62,8 @@ public class BazelPackageBuilderHelperForTesting implements Package.Builder.Help // This is synchronized because some Skylark internals aren't thread safe. private synchronized void sanityCheckBazelPackageLoader( Package pkg, - RuleClassProvider ruleClassProvider) { + RuleClassProvider ruleClassProvider, + SkylarkSemantics skylarkSemantics) { PackageIdentifier pkgId = pkg.getPackageIdentifier(); if (pkgId.equals(Label.EXTERNAL_PACKAGE_IDENTIFIER) || !pkg.getPackageIdentifier().getRepository().isMain() @@ -77,6 +79,7 @@ public class BazelPackageBuilderHelperForTesting implements Package.Builder.Help 0, numFullFilenameFragmentSegments - (numNameSegments + 1))); PackageLoader packageLoader = BazelPackageLoader.builder(workspaceRoot) + .setSkylarkSemantics(skylarkSemantics) .setRuleClassProvider(ruleClassProvider) .build(); Package newlyLoadedPkg; |