-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow changing the CPP Toolchain. (#955)
The cpp default toolchain on windows was hardset to cc-compiler-k8, which is linux exclusive. Additionally it's quite common to need to change the compiler being used. The drawback of this approach is that it potentially creates many repetitive equal cc_toolchains if you use the same container with multiple toolings installed. Long term we could add multiple cpp toolchains to configs/, but so far the limited amount of repetition isn't harmful.
- Loading branch information
Showing
4 changed files
with
135 additions
and
30 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // Copyright 2021 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 rbeconfigsgen | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestGenCppToolchainTarget(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| want string | ||
| opt *Options | ||
| }{ | ||
| { | ||
| name: "No options, linux, choose default", | ||
| want: "//cc:cc-compiler-k8", | ||
| opt: &Options{ | ||
| ExecOS: "linux", | ||
| }, | ||
| }, { | ||
| name: "No options, windows, choose default", | ||
| want: "//cc:cc-compiler-x64_windows", | ||
| opt: &Options{ | ||
| ExecOS: "windows", | ||
| }, | ||
| }, { | ||
| name: "Windows pick compiler", | ||
| want: "//cc:cc-compiler-x64_windows_mingw", | ||
| opt: &Options{ | ||
| ExecOS: "windows", | ||
| CPPToolchainTargetName: "cc-compiler-x64_windows_mingw", | ||
| }, | ||
| }, { | ||
| name: "Linux pick output path", | ||
| want: "//configs/foo/bar/cc:cc-compiler-k8", | ||
| opt: &Options{ | ||
| ExecOS: "linux", | ||
| OutputConfigPath: "configs/foo/bar", | ||
| }, | ||
| }, { | ||
| name: "Windows pick output path and compiler", | ||
| want: "//configs/fizz/buzz/cc:foobar-cc-good", | ||
| opt: &Options{ | ||
| ExecOS: "windows", | ||
| OutputConfigPath: "configs/fizz/buzz", | ||
| CPPToolchainTargetName: "foobar-cc-good", | ||
| }, | ||
| }, { | ||
| name: "Windows pick backslash style path and compiler", | ||
| want: "//configs/fizz/buzz/cc:foobar-cc-good", | ||
| opt: &Options{ | ||
| ExecOS: "windows", | ||
| OutputConfigPath: "configs\\fizz\\buzz", | ||
| CPPToolchainTargetName: "foobar-cc-good", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range tests { | ||
| tc := tc | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| t.Parallel() | ||
| if err := tc.opt.ApplyDefaults(tc.opt.ExecOS); err != nil { | ||
| t.Fatalf("ApplyDefaults: Failed to apply defaults=%v", err) | ||
| } | ||
| // We skip validation since we don't set all options required for | ||
| // regular execution. | ||
| if got := genCppToolchainTarget(tc.opt); got != tc.want { | ||
| t.Fatalf("GenCppToolchainTarget: %v, wanted %v", got, tc.want) | ||
| } | ||
| }) | ||
| } | ||
| } |