diff options
| author |  John Cater <jcater@google.com> | 2018-02-23 08:01:28 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-23 08:03:36 -0800 |
| commit | 4ccecae85c12086e9610b67b50d21f5470fa89b6 (patch) | |
| tree | 6108df78620dd19a470413233e286cba82328b8b /src/test/java/com/google | |
| parent | 246f0aa048aeb3f456c89565e1e3021957b6cef4 (diff) | |
Remove some default cc toolchain definitions.
Change-Id: Idb0c9fe770cd73c2760bee92997063c4c9b2e94e
PiperOrigin-RevId: 186768436
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java | 8 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java index 37356a7385..6f94f5a852 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java @@ -163,14 +163,8 @@ public final class BazelMockCcSupport extends MockCcSupport { " target_compatible_with = [':mock_value'],", ")", "toolchain(", - " name = 'dummy_cc_toolchain_type',", - " toolchain_type = ':toolchain_type',", - " toolchain = ':dummy_cc_toolchain_impl',", - ")", - "filegroup(name = 'toolchain_category')", - "toolchain(", " name = 'dummy_cc_toolchain',", - " toolchain_type = ':toolchain_category',", + " toolchain_type = ':toolchain_type',", " toolchain = ':dummy_cc_toolchain_impl',", ")", "load(':dummy_toolchain.bzl', 'dummy_toolchain')", diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java index e45680d1d4..d405ef8186 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java @@ -41,8 +41,8 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase { assertThatEvaluationResult(result).hasEntryThat(toolchainsKey).isNotNull(); RegisteredToolchainsValue value = result.get(toolchainsKey); - // We have two registered toolchains, and two default for c++ - assertThat(value.registeredToolchains()).hasSize(4); + // We have two registered toolchains, and a default for c++ + assertThat(value.registeredToolchains()).hasSize(3); assertThat( value |