From b38e3af9114ff91906cd1109fba9bddca86db185 Mon Sep 17 00:00:00 2001 From: cpeyser Date: Mon, 11 Sep 2017 16:58:58 +0200 Subject: Toolchain providers are propagated in the ToolchainContext instance made available from BuildViewTestCase#getRuleContext PiperOrigin-RevId: 168231020 --- .../com/google/devtools/build/lib/analysis/BuildViewTest.java | 2 +- .../devtools/build/lib/analysis/DependencyResolverTest.java | 3 ++- .../google/devtools/build/lib/skyframe/RuleContextTest.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 83bcdad904..00130f8282 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -390,7 +390,7 @@ public class BuildViewTest extends BuildViewTestBase { update("//package:top"); ConfiguredTarget top = getConfiguredTarget("//package:top", getTargetConfiguration()); Iterable targets = getView().getDirectPrerequisiteDependenciesForTesting( - reporter, top, getBuildConfigurationCollection()).values(); + reporter, top, getBuildConfigurationCollection(), /*toolchainContext=*/ null).values(); Dependency innerDependency = Dependency.withTransitionAndAspects( diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java index 3d29927842..1444837448 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java @@ -109,7 +109,8 @@ public class DependencyResolverTest extends AnalysisTestCase { new TargetAndConfiguration(target, getTargetConfiguration()), getHostConfiguration(), aspect != null ? Aspect.forNative(aspect) : null, - ImmutableMap.of()); + ImmutableMap.of(), + /*toolchainContext=*/ null); } @SafeVarargs diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java index 1eeec40c78..d5b345d3d1 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java @@ -17,6 +17,8 @@ package com.google.devtools.build.lib.skyframe; import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.analysis.RuleContext; +import com.google.devtools.build.lib.analysis.ToolchainContext.ResolvedToolchainProviders; +import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.rules.platform.ToolchainTestCase; import org.junit.Test; @@ -36,5 +38,13 @@ public class RuleContextTest extends ToolchainTestCase { RuleContext ruleContext = getRuleContext(getConfiguredTarget("//x")); assertThat(ruleContext.getToolchainContext().getResolvedToolchainLabels()) .contains(Label.parseAbsolute("//toolchain:test_toolchain_1")); + + ResolvedToolchainProviders resolvedToolchainProviders = + (ResolvedToolchainProviders) + ruleContext.getToolchainContext().getResolvedToolchainProviders(); + ToolchainInfo toolchain = + resolvedToolchainProviders.getForToolchainType( + Label.parseAbsolute("//toolchain:test_toolchain")); + assertThat(toolchain.getValue("data")).isEqualTo("foo"); } } -- cgit v1.2.3