Fix automatic host platform detection to check the --host_cpu flag.

Also adds a new target_platform attribute that checks the --cpu flag.

Part of #2219.

Change-Id: Icc732917db127ac8377a7722adc70b1a722d538a
PiperOrigin-RevId: 158143095

1 files changed, 30 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
index 4553647f1f..a60ff1d4de 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
@@ -73,19 +73,42 @@ public class PlatformInfoTest extends BuildViewTestCase {
     new EqualsTester()
         .addEqualityGroup(
             // Base case.
-            PlatformInfo.builder().addConstraint(value1).addConstraint(value2).build(),
-            PlatformInfo.builder().addConstraint(value1).addConstraint(value2).build(),
             PlatformInfo.builder()
+                .setLabel(makeLabel("//platform/plat1"))
+                .addConstraint(value1)
+                .addConstraint(value2)
+                .build(),
+            PlatformInfo.builder()
+                .setLabel(makeLabel("//platform/plat1"))
+                .addConstraint(value1)
+                .addConstraint(value2)
+                .build(),
+            PlatformInfo.builder()
+                .setLabel(makeLabel("//platform/plat1"))
                 .addConstraint(value1)
                 .addConstraint(value2)
                 .addRemoteExecutionProperty("key", "val") // execution properties are ignored.
                 .build())
         .addEqualityGroup(
+            // Different label.
+            PlatformInfo.builder()
+                .setLabel(makeLabel("//platform/plat2"))
+                .addConstraint(value1)
+                .addConstraint(value2)
+                .build())
+        .addEqualityGroup(
             // Extra constraint.
-            PlatformInfo.builder().addConstraint(value1).addConstraint(value3).build())
+            PlatformInfo.builder()
+                .setLabel(makeLabel("//platform/plat1"))
+                .addConstraint(value1)
+                .addConstraint(value3)
+                .build())
         .addEqualityGroup(
             // Missing constraint.
-            PlatformInfo.builder().addConstraint(value1).build())
+            PlatformInfo.builder()
+                .setLabel(makeLabel("//platform/plat1"))
+                .addConstraint(value1)
+                .build())
         .testEquals();
   }
 
@@ -96,7 +119,8 @@ public class PlatformInfoTest extends BuildViewTestCase {
         "def _impl(ctx):",
         "  constraints = [val[platform_common.ConstraintValueInfo] "
             + "for val in ctx.attr.constraints]",
-        "  platform = platform_common.PlatformInfo(constraint_values = constraints)",
+        "  platform = platform_common.PlatformInfo(",
+        "      label = ctx.label, constraint_values = constraints)",
         "  return [platform]",
         "my_platform = rule(",
         "  implementation = _impl,",
@@ -117,6 +141,7 @@ public class PlatformInfoTest extends BuildViewTestCase {
 
     PlatformInfo provider = PlatformProviderUtils.platform(platform);
     assertThat(provider).isNotNull();
+    assertThat(provider.label()).isEqualTo(makeLabel("//test/platform:custom"));
     assertThat(provider.constraints()).hasSize(1);
     ConstraintSettingInfo constraintSetting =
         ConstraintSettingInfo.create(makeLabel("//constraint:basic"));