From 1099b54281c51f947ecaa93e2b6569460f2895fa Mon Sep 17 00:00:00 2001 From: cpeyser Date: Wed, 6 Sep 2017 18:19:20 +0200 Subject: RuleContext instances obtained through BuildViewTestCase#getRuleContext have a ToolchainContext. PiperOrigin-RevId: 167729868 --- .../devtools/build/lib/analysis/BuildView.java | 21 +++++-- .../build/lib/analysis/PlatformSemantics.java | 8 ++- .../build/lib/analysis/ToolchainContext.java | 1 + .../skyframe/SkyFunctionEnvironmentForTesting.java | 65 ++++++++++++++++++++++ .../build/lib/skyframe/SkyframeExecutor.java | 11 ++++ 5 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctionEnvironmentForTesting.java (limited to 'src/main/java/com/google') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 9708f3eb8b..7797838c06 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -86,6 +86,7 @@ import com.google.devtools.build.lib.skyframe.CoverageReportValue; import com.google.devtools.build.lib.skyframe.SkyframeAnalysisResult; import com.google.devtools.build.lib.skyframe.SkyframeBuildView; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; +import com.google.devtools.build.lib.skyframe.ToolchainUtil.ToolchainContextException; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.SkylarkImport; import com.google.devtools.build.lib.syntax.SkylarkImports; @@ -1225,10 +1226,11 @@ public class BuildView { */ @VisibleForTesting public RuleContext getRuleContextForTesting( - ConfiguredTarget target, StoredEventHandler eventHandler, + ConfiguredTarget target, + StoredEventHandler eventHandler, BuildConfigurationCollection configurations) throws EvalException, InvalidConfigurationException, InterruptedException, - InconsistentAspectOrderException { + InconsistentAspectOrderException, ToolchainContextException { BuildConfiguration targetConfig = target.getConfiguration(); CachingAnalysisEnvironment env = new CachingAnalysisEnvironment(getArtifactFactory(), @@ -1243,12 +1245,20 @@ public class BuildView { * given configured target. */ @VisibleForTesting - public RuleContext getRuleContextForTesting(ExtendedEventHandler eventHandler, + public RuleContext getRuleContextForTesting( + ExtendedEventHandler eventHandler, ConfiguredTarget target, - AnalysisEnvironment env, BuildConfigurationCollection configurations) + AnalysisEnvironment env, + BuildConfigurationCollection configurations) throws EvalException, InvalidConfigurationException, InterruptedException, - InconsistentAspectOrderException { + InconsistentAspectOrderException, ToolchainContextException { BuildConfiguration targetConfig = target.getConfiguration(); + List