Skip to content

Commit fc050f2

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

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

clwb/tests/headlesstests/com/google/idea/blaze/clwb/ProtobufCacheTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
import static com.google.idea.blaze.clwb.base.Assertions.assertCachedHeader;
66
import static com.google.idea.blaze.clwb.base.TestUtils.setIncludesCacheEnabled;
77

8+
import com.google.idea.blaze.base.bazel.BazelVersion;
89
import com.google.idea.blaze.clwb.base.ClwbHeadlessTestCase;
910
import com.google.idea.testing.headless.BazelVersionRule;
11+
import com.google.idea.testing.headless.ProjectViewBuilder;
1012
import com.intellij.util.system.OS;
1113
import org.junit.Rule;
1214
import org.junit.Test;
@@ -34,6 +36,18 @@ public void testClwb() {
3436
checkProto();
3537
}
3638

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+
3751
private void checkProto() {
3852
final var compilerSettings = findFileCompilerSettings("main/main.cc");
3953

clwb/tests/headlesstests/com/google/idea/blaze/clwb/ProtobufTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import static com.google.idea.blaze.clwb.base.Assertions.assertContainsHeader;
55
import static com.google.idea.blaze.clwb.base.TestUtils.setIncludesCacheEnabled;
66

7+
import com.google.idea.blaze.base.bazel.BazelVersion;
78
import com.google.idea.blaze.clwb.base.AllowedVfsRoot;
89
import com.google.idea.blaze.clwb.base.ClwbHeadlessTestCase;
910
import com.google.idea.testing.headless.BazelVersionRule;
11+
import com.google.idea.testing.headless.ProjectViewBuilder;
1012
import com.intellij.util.system.OS;
1113
import java.util.ArrayList;
1214
import org.junit.Rule;
@@ -35,6 +37,18 @@ public void testClwb() {
3537
checkProto();
3638
}
3739

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+
3852
@Override
3953
protected void addAllowedVfsRoots(ArrayList<AllowedVfsRoot> roots) {
4054
super.addAllowedVfsRoots(roots);

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

0 commit comments

Comments
 (0)