-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change PlatformConfiguration to only have a single target platform.
This is the actual situation that has existed and will continue to be supported: each ConfiguredTarget has a single target platform. When we update to support multi-platform builds, the configuration will be split at the top level so that each split still only sees a single target platform. Multi-arch platforms (such as fat binaries) will need a single platform to represent the multi-arch situation, and rules will need to know how to handle generating and combining the proper single-target dependencies: this is the same situation we have currently. Change-Id: I904d74d136c761fa9c8da329040dd20920db00b7 Closes #5755. Change-Id: Icaa539fa864d005c754986f7c98dac1bb8dc7e35 PiperOrigin-RevId: 209939618
- Loading branch information
Showing
6 changed files
with
227 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
173 changes: 173 additions & 0 deletions
173
src/test/java/com/google/devtools/build/lib/rules/platform/PlatformConfigurationApiTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| // Copyright 2018 The Bazel Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| package com.google.devtools.build.lib.rules.platform; | ||
|
|
||
| import static com.google.common.truth.Truth.assertThat; | ||
| import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import com.google.devtools.build.lib.analysis.ConfiguredTarget; | ||
| import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; | ||
| import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; | ||
| import com.google.devtools.build.lib.cmdline.Label; | ||
| import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey; | ||
| import com.google.devtools.build.lib.packages.StructImpl; | ||
| import com.google.devtools.build.lib.skylarkbuildapi.platform.PlatformConfigurationApi; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.JUnit4; | ||
|
|
||
| /** Tests Skylark API for Platform configuration fragments. */ | ||
| @RunWith(JUnit4.class) | ||
| public class PlatformConfigurationApiTest extends BuildViewTestCase { | ||
|
|
||
| @Test | ||
| public void testHostPlatform() throws Exception { | ||
| scratch.file("platforms/BUILD", "platform(name = 'test_platform')"); | ||
|
|
||
| useConfiguration("--host_platform=//platforms:test_platform"); | ||
| ruleBuilder().build(); | ||
| scratch.file( | ||
| "foo/BUILD", | ||
| "load(':extension.bzl', 'my_rule')", | ||
| "my_rule(", | ||
| " name = 'my_skylark_rule',", | ||
| ")"); | ||
| assertNoEvents(); | ||
|
|
||
| PlatformConfigurationApi platformConfiguration = fetchPlatformConfiguration(); | ||
| assertThat(platformConfiguration).isNotNull(); | ||
| assertThat(platformConfiguration.getHostPlatform()) | ||
| .isEqualTo(Label.parseAbsoluteUnchecked("//platforms:test_platform")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testHostPlatform_unset() { | ||
| assertThrows(InvalidConfigurationException.class, () -> useConfiguration("--host_platform=")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testTargetPlatform_single() throws Exception { | ||
| scratch.file("platforms/BUILD", "platform(name = 'test_platform')"); | ||
|
|
||
| useConfiguration("--platforms=//platforms:test_platform"); | ||
| ruleBuilder().build(); | ||
| scratch.file( | ||
| "foo/BUILD", | ||
| "load(':extension.bzl', 'my_rule')", | ||
| "my_rule(", | ||
| " name = 'my_skylark_rule',", | ||
| ")"); | ||
| assertNoEvents(); | ||
|
|
||
| PlatformConfigurationApi platformConfiguration = fetchPlatformConfiguration(); | ||
| assertThat(platformConfiguration).isNotNull(); | ||
| assertThat(platformConfiguration.getTargetPlatform()) | ||
| .isEqualTo(Label.parseAbsoluteUnchecked("//platforms:test_platform")); | ||
| assertThat(platformConfiguration.getTargetPlatforms()) | ||
| .containsExactly(Label.parseAbsoluteUnchecked("//platforms:test_platform")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testTargetPlatform_unset() { | ||
| assertThrows(InvalidConfigurationException.class, () -> useConfiguration("--platforms=")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testTargetPlatform_multiple() throws Exception { | ||
| scratch.file( | ||
| "platforms/BUILD", | ||
| "platform(name = 'test_platform1')", | ||
| "platform(name = 'test_platform2')"); | ||
|
|
||
| useConfiguration("--platforms=//platforms:test_platform1,//platforms:test_platform2"); | ||
| ruleBuilder().build(); | ||
| scratch.file( | ||
| "foo/BUILD", | ||
| "load(':extension.bzl', 'my_rule')", | ||
| "my_rule(", | ||
| " name = 'my_skylark_rule',", | ||
| ")"); | ||
| assertNoEvents(); | ||
|
|
||
| PlatformConfigurationApi platformConfiguration = fetchPlatformConfiguration(); | ||
| assertThat(platformConfiguration).isNotNull(); | ||
| // Despite setting two platforms in the flag, only a single platform should be visible to the | ||
| // target. | ||
| assertThat(platformConfiguration.getTargetPlatform()) | ||
| .isEqualTo(Label.parseAbsoluteUnchecked("//platforms:test_platform1")); | ||
| assertThat(platformConfiguration.getTargetPlatforms()) | ||
| .containsExactly(Label.parseAbsoluteUnchecked("//platforms:test_platform1")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEnabledToolchainTypes() throws Exception { | ||
| scratch.file( | ||
| "toolchains/BUILD", | ||
| "toolchain_type(name = 'test_toolchain_type1')", | ||
| "toolchain_type(name = 'test_toolchain_type2')", | ||
| "toolchain_type(name = 'test_toolchain_type3')"); | ||
|
|
||
| useConfiguration( | ||
| "--enabled_toolchain_types=" | ||
| + "//toolchains:test_toolchain_type1,//toolchains:test_toolchain_type3"); | ||
| ruleBuilder().build(); | ||
| scratch.file( | ||
| "foo/BUILD", | ||
| "load(':extension.bzl', 'my_rule')", | ||
| "my_rule(", | ||
| " name = 'my_skylark_rule',", | ||
| ")"); | ||
| assertNoEvents(); | ||
|
|
||
| PlatformConfigurationApi platformConfiguration = fetchPlatformConfiguration(); | ||
| assertThat(platformConfiguration).isNotNull(); | ||
| assertThat(platformConfiguration.getEnabledToolchainTypes()) | ||
| .containsExactly( | ||
| Label.parseAbsoluteUnchecked("//toolchains:test_toolchain_type1"), | ||
| Label.parseAbsoluteUnchecked("//toolchains:test_toolchain_type3")); | ||
| } | ||
|
|
||
| private RuleBuilder ruleBuilder() { | ||
| return new RuleBuilder(); | ||
| } | ||
|
|
||
| private class RuleBuilder { | ||
| private void build() throws Exception { | ||
| ImmutableList.Builder<String> lines = ImmutableList.builder(); | ||
| lines.add( | ||
| "result = provider()", | ||
| "def _impl(ctx):", | ||
| " platformConfig = ctx.fragments.platform", | ||
| " return [result(property = platformConfig)]"); | ||
| lines.add("my_rule = rule(", " implementation = _impl,", " fragments = ['platform'],", ")"); | ||
|
|
||
| scratch.file("foo/extension.bzl", lines.build().toArray(new String[] {})); | ||
| } | ||
| } | ||
|
|
||
| private PlatformConfigurationApi fetchPlatformConfiguration() throws Exception { | ||
| ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); | ||
| StructImpl info = | ||
| (StructImpl) | ||
| myRuleTarget.get( | ||
| new SkylarkKey( | ||
| Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| PlatformConfigurationApi javaInfo = (PlatformConfigurationApi) info.getValue("property"); | ||
| return javaInfo; | ||
| } | ||
| } |