diff options
author | brandjon <brandjon@google.com> | 2017-10-06 06:07:13 +0200 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2017-10-06 19:48:49 +0200 |
commit | 617f8ff0f502e911bba61d0c33390413bef9250c (patch) | |
tree | fbb7e2481dc85609f13ca8be207d01e6fa7a38fd /src/test/java/com/google/devtools/build/lib/analysis/util | |
parent | b4d87b54ec6d4aa95d3b77f23aed2ad75619e968 (diff) |
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
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java | 6 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java index bae2beffd0..f065cfda79 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java @@ -46,7 +46,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollectio import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.ExtendedEventHandler; -import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions; +import com.google.devtools.build.lib.syntax.SkylarkSemantics; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.PathFragment; @@ -158,7 +158,7 @@ public final class AnalysisTestUtil { } @Override - public SkylarkSemanticsOptions getSkylarkSemantics() throws InterruptedException { + public SkylarkSemantics getSkylarkSemantics() throws InterruptedException { return original.getSkylarkSemantics(); } @@ -353,7 +353,7 @@ public final class AnalysisTestUtil { } @Override - public SkylarkSemanticsOptions getSkylarkSemantics() throws InterruptedException { + public SkylarkSemantics getSkylarkSemantics() throws InterruptedException { return null; } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index d7af5093c4..acd56aa941 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -131,6 +131,7 @@ import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; +import com.google.devtools.build.lib.syntax.SkylarkSemantics; import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions; import com.google.devtools.build.lib.testutil.BlazeTestUtils; import com.google.devtools.build.lib.testutil.FoundationTestCase; @@ -284,8 +285,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { return ImmutableList.<EnvironmentExtension>of(); } - protected SkylarkSemanticsOptions getSkylarkSemantics() { - return skylarkSemanticsOptions; + protected SkylarkSemantics getSkylarkSemantics() { + return skylarkSemanticsOptions.toSkylarkSemantics(); } protected ResourceSet getStartingResources() { @@ -1710,7 +1711,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { } @Override - public SkylarkSemanticsOptions getSkylarkSemantics() { + public SkylarkSemantics getSkylarkSemantics() { throw new UnsupportedOperationException(); } |