Inject the Constants.TOOLS_REPOSITORY in SkylarkRuleClassFunctions.testBaseRule

via the Skylark and delete the constant. Also, change the isLoadingPhase in the 
Skylark environment an enum Phase in order to:
- Decide whether testRules are enabled or not and,
- Check that the toolsRepository is set when in the LOADING phase.

Finally, a few tests that were using ConfiguredRuleClassProvider directly 
had to be updated to set a tools repository, otherwise createGlobals() fails.

--
MOS_MIGRATED_REVID=121022804

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index 7608c31293..f8d885fc01 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -37,6 +37,7 @@ import com.google.devtools.build.lib.syntax.ClassObject;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Environment.Extension;
 import com.google.devtools.build.lib.syntax.Environment.Frame;
+import com.google.devtools.build.lib.syntax.Environment.Phase;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.FuncallExpression;
 import com.google.devtools.build.lib.syntax.FunctionSignature;
@@ -73,7 +74,7 @@ public class WorkspaceFactory {
           PackageFactory.PKG_CONTEXT);
 
   private final LegacyBuilder builder;
-  
+
   private final Path installDir;
   private final Path workspaceDir;
   private final Mutability mutability;
@@ -190,7 +191,7 @@ public class WorkspaceFactory {
       importMap = parentImportMap;
     }
     environmentBuilder.setImportedExtensions(importMap);
-    Environment workspaceEnv = environmentBuilder.setLoadingPhase().build();
+    Environment workspaceEnv = environmentBuilder.setPhase(Phase.WORKSPACE).build();
     addWorkspaceFunctions(workspaceEnv, localReporter);
     for (Map.Entry<String, Object> binding : parentVariableBindings.entrySet()) {
       try {