Cleanup, remove differences between Build and Skylark environments.

The only visible difference for users is that a few more functions are
available in BUILD files. That's fine, this difference was not even
documented.

RELNOTES:
  A few functions are added to BUILD files for consistency (hash, dir,
  hasattr, getattr) with .bzl files, although they are not very useful.

--
MOS_MIGRATED_REVID=136151633

1 files changed, 3 insertions, 13 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java b/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java
index 5fc46214f7..2f4ce9fce9 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SubincludePreprocessorTest.java
@@ -22,33 +22,24 @@ import static org.junit.Assert.fail;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
 import com.google.devtools.build.lib.packages.util.SubincludePreprocessor;
-import com.google.devtools.build.lib.syntax.Environment;
-import com.google.devtools.build.lib.syntax.Mutability;
 import com.google.devtools.build.lib.syntax.ParserInputSource;
 import com.google.devtools.build.lib.testutil.Suite;
 import com.google.devtools.build.lib.testutil.TestSpec;
 import com.google.devtools.build.lib.vfs.Path;
-
+import java.io.IOException;
+import java.nio.CharBuffer;
+import java.nio.charset.StandardCharsets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.io.IOException;
-import java.nio.CharBuffer;
-import java.nio.charset.StandardCharsets;
-
 @TestSpec(size = Suite.MEDIUM_TESTS)
 @RunWith(JUnit4.class)
 public class SubincludePreprocessorTest extends PackageLoadingTestCase {
   private Path packageRoot;
   protected SubincludePreprocessor preprocessor;
-  protected Environment globalEnv =
-      Environment.builder(Mutability.create("test"))
-          .setGlobals(Environment.BUILD)
-          .setEventHandler(reporter)
-          .build();
 
   public SubincludePreprocessorTest() {}
 
@@ -83,7 +74,6 @@ public class SubincludePreprocessorTest extends PackageLoadingTestCase {
             buildFileBytes,
             packageName, /*globber=*/
             null,
-            globalEnv.getGlobals(),
             /*ruleNames=*/ null);
     Event.replayEventsOn(reporter, result.events);
     return result;