commit ba1232130ac86dcf30503fe82518971a396d6297
author John Cater <jcater@google.com> Thu Jun 13 08:03:52 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 13 08:04:45 2019 -0700
tree 54f9433a6e15d0ebe6b9eb069cb9ca01b3819b72
parent 7eb483c517be0a9453e2f07b107ba8d5c41c6e65

Update toolchain resolution to not favor the host platform when no

toolchain types are required.

This makes the selection algorithms easier to understand, and will
correctly handle genrule and similar rules.

Fixes #8608.

Closes #8616.

PiperOrigin-RevId: 253029010

src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
index 86077dd..8037827 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java
@@ -153,14 +153,10 @@
 
     assertThat(unloadedToolchainContext.requiredToolchainTypes()).isEmpty();
 
-    // With no toolchains requested, should fall back to the host platform.
+    // Even with no toolchains requested, should still select the first execution platform.
     assertThat(unloadedToolchainContext.executionPlatform()).isNotNull();
     assertThat(unloadedToolchainContext.executionPlatform().label())
-        .isEqualTo(Label.parseAbsoluteUnchecked("//host:host"));
-
-    assertThat(unloadedToolchainContext.targetPlatform()).isNotNull();
-    assertThat(unloadedToolchainContext.targetPlatform().label())
-        .isEqualTo(Label.parseAbsoluteUnchecked("//platforms:linux"));
+        .isEqualTo(Label.parseAbsoluteUnchecked("//platforms:mac"));
   }
 
   @Test