commit a6ad2d5564ad8ce7c7ebd0ba093db578cf5ae3cf
author vladmos <vladmos@google.com> Wed May 03 19:24:18 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Thu May 04 13:13:21 2017 +0200
tree 285c72f8bfdcc05d4ba0072c7fe1580912c43cd2
parent 9688e24616ab40bac8438948de6003d66f02570b

Implement a flag to deprecate old constructor for depsets (`set`)

Usage: --incompatible_depset_constructor=true (the default value is false).
PiperOrigin-RevId: 154971526

src/test/java/com/google/devtools/build/lib/testutil/TestMode.java

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
index 21132c2..12b8e6b 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
@@ -17,19 +17,30 @@
 import com.google.devtools.build.lib.syntax.BazelLibrary;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Mutability;
+import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions;
+import com.google.devtools.common.options.OptionsParser;
 
 /**
  * Describes a particular testing mode by determining how the
  * appropriate {@code Environment} has to be created
  */
 public abstract class TestMode {
+  private static SkylarkSemanticsOptions parseSkylarkSemanticsOptions(String... skylarkOptions)
+      throws Exception {
+    OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+    parser.parse(skylarkOptions);
+    return parser.getOptions(SkylarkSemanticsOptions.class);
+  }
+
   public static final TestMode BUILD =
       new TestMode() {
         @Override
-        public Environment createEnvironment(EventHandler eventHandler, Environment environment) {
+        public Environment createEnvironment(EventHandler eventHandler, String... skylarkOptions)
+            throws Exception {
           return Environment.builder(Mutability.create("build test"))
-              .setGlobals(environment == null ? BazelLibrary.GLOBALS : environment.getGlobals())
+              .setGlobals(BazelLibrary.GLOBALS)
               .setEventHandler(eventHandler)
+              .setSemantics(TestMode.parseSkylarkSemanticsOptions(skylarkOptions))
               .build();
         }
       };
@@ -37,13 +48,16 @@
   public static final TestMode SKYLARK =
       new TestMode() {
         @Override
-        public Environment createEnvironment(EventHandler eventHandler, Environment environment) {
+        public Environment createEnvironment(EventHandler eventHandler, String... skylarkOptions)
+            throws Exception {
           return Environment.builder(Mutability.create("skylark test"))
-              .setGlobals(environment == null ? BazelLibrary.GLOBALS : environment.getGlobals())
+              .setGlobals(BazelLibrary.GLOBALS)
               .setEventHandler(eventHandler)
+              .setSemantics(TestMode.parseSkylarkSemanticsOptions(skylarkOptions))
               .build();
         }
       };
 
-  public abstract Environment createEnvironment(EventHandler eventHandler, Environment environment);
+  public abstract Environment createEnvironment(EventHandler eventHandler, String... skylarkOptions)
+      throws Exception;
 }