Skip to content

Commit 4163454

Browse files
committed
added platform specific configuration to tests
1 parent deb41d4 commit 4163454

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
build:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl
2+
build:windows --extra_execution_platforms=//:x64_windows-clang-cl
3+

clwb/tests/projects/protobuf/MODULE.bazel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@ bazel_dep(name = "platforms", version = "1.0.0")
33
bazel_dep(name = "protobuf", version = "31.1")
44

55
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")

testing/src/com/google/idea/testing/headless/HeadlessTestCase.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.intellij.testFramework.HeavyPlatformTestCase;
4848
import com.intellij.testFramework.PlatformTestUtil;
4949
import com.intellij.toolWindow.ToolWindowHeadlessManagerImpl;
50+
import com.intellij.util.system.OS;
5051
import java.io.ByteArrayOutputStream;
5152
import java.io.File;
5253
import java.io.IOException;
@@ -261,6 +262,12 @@ protected ProjectViewBuilder projectViewText(BazelVersion version) {
261262
builder.addSyncFlag("--incompatible_use_plus_in_repo_names");
262263
}
263264

265+
switch (OS.CURRENT) {
266+
case Linux -> builder.addBuildFlag("--config=linux");
267+
case Windows -> builder.addBuildFlag("--config=windows");
268+
case macOS -> builder.addBuildFlag("--config=macOS");
269+
}
270+
264271
return builder;
265272
}
266273

0 commit comments

Comments
 (0)