Enable load() statement in the WORKSPACE file.

RELNOTES[NEW]: Skylark macros are now enabled in WORKSPACE file.

Design document at https://docs.google.com/document/d/1jKbNXOVp2T1zJD_iRnVr8k5D0xZKgO8blMVDlXOksJg/preview

Fixes #337

--
MOS_MIGRATED_REVID=108860301

3 files changed, 12 insertions, 14 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java b/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java
index 3d83246b52..5af665a7b1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java
@@ -48,15 +48,12 @@ public class ExternalPackageTest extends BuildViewTestCase {
   public void testMultipleRulesWithSameName() throws Exception {
     Builder builder = Package.newExternalPackageBuilder(workspacePath, "TESTING");
 
-    // The WORKSPACE file allows rules to be overridden, but the TestRuleClassProvider doesn't
-    // provide WORKSPACE rules (new_local_repo et al). So for the test, we create an
-    // ExternalPackage with BUILD rules, even though these rules wouldn't ordinarily be added to
-    // ExternalPackage.
-    Location buildFile = Location.fromFile(getOutputPath().getRelative("BUILD"));
+    // The WORKSPACE file allows rules to be overridden.
+    Location buildFile = Location.fromFile(getOutputPath().getRelative("WORKSPACE"));
 
     // Add first rule.
     RuleClass ruleClass =
-        TestRuleClassProvider.getRuleClassProvider().getRuleClassMap().get("cc_library");
+        TestRuleClassProvider.getRuleClassProvider().getRuleClassMap().get("local_repository");
     RuleClass bindRuleClass =
         TestRuleClassProvider.getRuleClassProvider().getRuleClassMap().get("bind");
 
@@ -70,7 +67,8 @@ public class ExternalPackageTest extends BuildViewTestCase {
         .createAndAddRepositoryRule(builder, ruleClass, bindRuleClass, kwargs, ast);
 
     // Add another rule with the same name.
-    ruleClass = TestRuleClassProvider.getRuleClassProvider().getRuleClassMap().get("sh_test");
+    ruleClass =
+        TestRuleClassProvider.getRuleClassProvider().getRuleClassMap().get("new_local_repository");
     ast =
         new FuncallExpression(
             new Identifier(ruleClass.getName()), Lists.<Argument.Passed>newArrayList());
@@ -81,6 +79,6 @@ public class ExternalPackageTest extends BuildViewTestCase {
     Package pkg = builder.build();
 
     // Make sure the second rule "wins."
-    assertEquals("sh_test rule", pkg.getTarget("my-rule").getTargetKind());
+    assertEquals("new_local_repository rule", pkg.getTarget("my-rule").getTargetKind());
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java
index 9634a0245b..c09de9f844 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java
@@ -147,7 +147,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase {
   public void testBuildRuleFailsInWorkspaceFile() throws Exception {
     Path myPkgPath = scratch.resolve("/foo/workspace/WORKSPACE");
     Package.Builder pkgBuilder =
-        new Package.Builder(PackageIdentifier.createInDefaultRepo("mypkg"), "TESTING")
+        new Package.Builder(Package.EXTERNAL_PACKAGE_IDENTIFIER, "TESTING")
             .setFilename(myPkgPath)
             .setMakeEnv(new MakeEnvironment.Builder());
 
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 6304b9c718..99999be0d1 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
@@ -121,7 +121,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   }
 
   private SkyKey key(String label) throws Exception {
-    return SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked(label));
+    return SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked(label), false);
   }
 
   private void checkLabel(String labelRequested, String labelFound) throws Exception {
@@ -134,7 +134,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
   public void testSkylarkImportLookupNoBuildFile() throws Exception {
     scratch.file("pkg/ext.bzl", "");
     SkyKey skylarkImportLookupKey =
-        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"));
+        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
     EvaluationResult<SkylarkImportLookupValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skylarkImportLookupKey, /*keepGoing=*/ false, reporter);
@@ -150,7 +150,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
     scratch.file("pkg1/ext.bzl", "a = 1");
     scratch.file("pkg2/ext.bzl", "load('/pkg1/ext', 'a')");
     SkyKey skylarkImportLookupKey =
-        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"));
+        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
     EvaluationResult<SkylarkImportLookupValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skylarkImportLookupKey, /*keepGoing=*/ false, reporter);
@@ -165,7 +165,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
     scratch.file("pkg/BUILD", "");
     scratch.file("pkg/ext.bzl", "load('/pkg/oops\u0000', 'a')");
     SkyKey skylarkImportLookupKey =
-        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"));
+        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
     EvaluationResult<SkylarkImportLookupValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skylarkImportLookupKey, /*keepGoing=*/ false, reporter);
@@ -180,7 +180,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase {
     scratch.file("pkg/BUILD", "");
     scratch.file("pkg/ext.bzl", "load('oops\u0000', 'a')");
     SkyKey skylarkImportLookupKey =
-        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"));
+        SkylarkImportLookupValue.key(Label.parseAbsoluteUnchecked("//pkg:ext.bzl"), false);
     EvaluationResult<SkylarkImportLookupValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skylarkImportLookupKey, /*keepGoing=*/ false, reporter);