File tree Expand file tree Collapse file tree 3 files changed +29
-4
lines changed
headlesstests/com/google/idea/blaze/clwb Expand file tree Collapse file tree 3 files changed +29
-4
lines changed Original file line number Diff line number Diff line change 5
5
import static com .google .idea .blaze .clwb .base .Assertions .assertCachedHeader ;
6
6
import static com .google .idea .blaze .clwb .base .TestUtils .setIncludesCacheEnabled ;
7
7
8
+ import com .google .idea .blaze .base .bazel .BazelVersion ;
8
9
import com .google .idea .blaze .clwb .base .ClwbHeadlessTestCase ;
9
10
import com .google .idea .testing .headless .BazelVersionRule ;
11
+ import com .google .idea .testing .headless .ProjectViewBuilder ;
10
12
import com .intellij .util .system .OS ;
11
13
import org .junit .Rule ;
12
14
import org .junit .Test ;
@@ -34,6 +36,18 @@ public void testClwb() {
34
36
checkProto ();
35
37
}
36
38
39
+ @ Override
40
+ protected ProjectViewBuilder projectViewText (BazelVersion version ) {
41
+ final var builder = super .projectViewText (version );
42
+
43
+ if (OS .CURRENT .equals (OS .Windows )) {
44
+ builder .addBuildFlag ("--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl" );
45
+ builder .addBuildFlag ("--extra_execution_platforms=//:x64_windows-clang-cl" );
46
+ }
47
+
48
+ return builder ;
49
+ }
50
+
37
51
private void checkProto () {
38
52
final var compilerSettings = findFileCompilerSettings ("main/main.cc" );
39
53
Original file line number Diff line number Diff line change 4
4
import static com .google .idea .blaze .clwb .base .Assertions .assertContainsHeader ;
5
5
import static com .google .idea .blaze .clwb .base .TestUtils .setIncludesCacheEnabled ;
6
6
7
+ import com .google .idea .blaze .base .bazel .BazelVersion ;
7
8
import com .google .idea .blaze .clwb .base .AllowedVfsRoot ;
8
9
import com .google .idea .blaze .clwb .base .ClwbHeadlessTestCase ;
9
10
import com .google .idea .testing .headless .BazelVersionRule ;
11
+ import com .google .idea .testing .headless .ProjectViewBuilder ;
10
12
import com .intellij .util .system .OS ;
11
13
import java .util .ArrayList ;
12
14
import org .junit .Rule ;
@@ -35,6 +37,18 @@ public void testClwb() {
35
37
checkProto ();
36
38
}
37
39
40
+ @ Override
41
+ protected ProjectViewBuilder projectViewText (BazelVersion version ) {
42
+ final var builder = super .projectViewText (version );
43
+
44
+ if (OS .CURRENT .equals (OS .Windows )) {
45
+ builder .addBuildFlag ("--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl" );
46
+ builder .addBuildFlag ("--extra_execution_platforms=//:x64_windows-clang-cl" );
47
+ }
48
+
49
+ return builder ;
50
+ }
51
+
38
52
@ Override
39
53
protected void addAllowedVfsRoots (ArrayList <AllowedVfsRoot > roots ) {
40
54
super .addAllowedVfsRoots (roots );
Original file line number Diff line number Diff line change @@ -3,7 +3,4 @@ bazel_dep(name = "platforms", version = "1.0.0")
3
3
bazel_dep (name = "protobuf" , version = "31.1" )
4
4
5
5
cc_configure = use_extension ("@rules_cc//cc:extensions.bzl" , "cc_configure_extension" )
6
- use_repo (cc_configure , "local_config_cc" )
7
-
8
- register_execution_platforms ("//:x64_windows-clang-cl" )
9
- register_toolchains ("@local_config_cc//:cc-toolchain-x64_windows-clang-cl" )
6
+ use_repo (cc_configure , "local_config_cc" )
You can’t perform that action at this time.
0 commit comments