Move ToolsRepository out of Environment

Other fields will follow (is_skylark, phase, callerLabel).
The goal is to make Environment (and more generally Skylark) less dependent
on Bazel.

--
MOS_MIGRATED_REVID=137386248

1 files changed, 15 insertions, 13 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
index 5efd8a8209..53331ea031 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
@@ -30,9 +30,9 @@ import com.google.devtools.build.lib.rules.SkylarkRuleContext.Kind;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Environment.Phase;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.SkylarkUtils;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 import com.google.devtools.build.lib.testutil.TestConstants;
-
 import org.junit.Before;
 
 /**
@@ -53,18 +53,20 @@ public abstract class SkylarkTestCase extends BuildViewTestCase {
     return new EvaluationTestCase() {
       @Override
       public Environment newEnvironment() throws Exception {
-        return Environment.builder(mutability)
-            .setSkylark()
-            .setEventHandler(getEventHandler())
-            .setGlobals(SkylarkModules.getGlobals(SkylarkModules.MODULES))
-            .setToolsRepository(TestConstants.TOOLS_REPOSITORY)
-            .setPhase(Phase.LOADING)
-            .build()
-            .setupDynamic(
-                PackageFactory.PKG_CONTEXT,
-                // This dummy pkgContext works because no Skylark unit test attempts to actually
-                // create rules. Creating actual rules is tested in SkylarkIntegrationTest.
-                new PackageContext(null, null, getEventHandler(), null));
+        Environment env =
+            Environment.builder(mutability)
+                .setSkylark()
+                .setEventHandler(getEventHandler())
+                .setGlobals(SkylarkModules.getGlobals(SkylarkModules.MODULES))
+                .setPhase(Phase.LOADING)
+                .build()
+                .setupDynamic(
+                    PackageFactory.PKG_CONTEXT,
+                    // This dummy pkgContext works because no Skylark unit test attempts to actually
+                    // create rules. Creating actual rules is tested in SkylarkIntegrationTest.
+                    new PackageContext(null, null, getEventHandler(), null));
+        SkylarkUtils.setToolsRepository(env, TestConstants.TOOLS_REPOSITORY);
+        return env;
       }
     };
   }