diff options
| author |  John Cater <jcater@google.com> | 2018-02-28 07:52:21 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-28 07:53:50 -0800 |
| commit | e959e44a4363fc12ae2df2c5bc0cd0d12f80bbd9 (patch) | |
| tree | 70f26ae98d7c8d0457e9c79236480124580d4988 /src/test/shell | |
| parent | e7d9e1f8aae459ec71cdb31f988661f4c3975ca8 (diff) | |
Update ToolchainUtil to properly load and use the available execution
platforms, and correctly merge together the results from TRF.
Part of #4442.
Change-Id: I31d83fa73a93d39a0e18d05a43a1c8666ac5a2d2
PiperOrigin-RevId: 187324257
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/bazel/toolchain_test.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/shell/bazel/toolchain_test.sh b/src/test/shell/bazel/toolchain_test.sh index 002a779531..24abfcc244 100755 --- a/src/test/shell/bazel/toolchain_test.sh +++ b/src/test/shell/bazel/toolchain_test.sh @@ -350,7 +350,8 @@ EOF --toolchain_resolution_debug \ //demo:use &> $TEST_log || fail "Build failed" expect_log 'ToolchainResolution: Looking for toolchain of type //toolchain:test_toolchain' - expect_log 'ToolchainResolution: Selected execution platforms and toolchains: {@bazel_tools//platforms:host_platform -> //:test_toolchain_impl_1}' + expect_log 'ToolchainResolution: For toolchain type //toolchain:test_toolchain, possible execution platforms and toolchains: {@bazel_tools//platforms:host_platform -> //:test_toolchain_impl_1}' + expect_log 'ToolchainUtil: Selected execution platform @bazel_tools//platforms:host_platform, type //toolchain:test_toolchain -> toolchain //:test_toolchain_impl_1' expect_log 'Using toolchain: rule message: "this is the rule", toolchain extra_str: "foo from test_toolchain"' } @@ -648,10 +649,10 @@ EOF EOF bazel build --platforms=//platform:not_a_platform //demo:use &> $TEST_log && fail "Build failure expected" - expect_log "While resolving toolchains for target //demo:use: Target //platform:not_a_platform was found as the target platform, but does not provide PlatformInfo" + expect_log "While resolving toolchains for target //demo:use: Target //platform:not_a_platform was referenced as a platform, but does not provide PlatformInfo" bazel build --host_platform=//platform:not_a_platform //demo:use &> $TEST_log && fail "Build failure expected" - expect_log "While resolving toolchains for target //demo:use: Target //platform:not_a_platform was found as the host platform, but does not provide PlatformInfo" + expect_log "While resolving toolchains for target //demo:use: Target //platform:not_a_platform was referenced as a platform, but does not provide PlatformInfo" } run_suite "toolchain tests" |