commit 617f8ff0f502e911bba61d0c33390413bef9250c
author brandjon <brandjon@google.com> Fri Oct 06 06:07:13 2017 +0200
committer Klaus Aehlig <aehlig@google.com> Fri Oct 06 19:48:49 2017 +0200
tree fbb7e2481dc85609f13ca8be207d01e6fa7a38fd
parent b4d87b54ec6d4aa95d3b77f23aed2ad75619e968

Pass SkylarkSemantics through Skyframe instead of the options class

Also remove the use of the @UsesOnlyCoreTypes annotation on SkylarkSemanticsOptions. It was only there to help mark that the options class was safe to put in Skyframe.

RELNOTES: None
PiperOrigin-RevId: 171248504

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 12b8e6b..b8c8947 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,6 +17,7 @@
 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.SkylarkSemantics;
 import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions;
 import com.google.devtools.common.options.OptionsParser;
 
@@ -25,11 +26,11 @@
  * appropriate {@code Environment} has to be created
  */
 public abstract class TestMode {
-  private static SkylarkSemanticsOptions parseSkylarkSemanticsOptions(String... skylarkOptions)
+  private static SkylarkSemantics parseSkylarkSemantics(String... skylarkOptions)
       throws Exception {
     OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
     parser.parse(skylarkOptions);
-    return parser.getOptions(SkylarkSemanticsOptions.class);
+    return parser.getOptions(SkylarkSemanticsOptions.class).toSkylarkSemantics();
   }
 
   public static final TestMode BUILD =
@@ -40,7 +41,7 @@
           return Environment.builder(Mutability.create("build test"))
               .setGlobals(BazelLibrary.GLOBALS)
               .setEventHandler(eventHandler)
-              .setSemantics(TestMode.parseSkylarkSemanticsOptions(skylarkOptions))
+              .setSemantics(TestMode.parseSkylarkSemantics(skylarkOptions))
               .build();
         }
       };
@@ -53,7 +54,7 @@
           return Environment.builder(Mutability.create("skylark test"))
               .setGlobals(BazelLibrary.GLOBALS)
               .setEventHandler(eventHandler)
-              .setSemantics(TestMode.parseSkylarkSemanticsOptions(skylarkOptions))
+              .setSemantics(TestMode.parseSkylarkSemantics(skylarkOptions))
               .build();
         }
       };