Skip to content

Commit e2b170c

Browse files
committed
Add build tools api to the integration tests
1 parent be0c787 commit e2b170c

File tree

2 files changed

+70
-58
lines changed

2 files changed

+70
-58
lines changed

kotlin/settings/BUILD.release.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,10 @@ bool_flag(
3333
build_setting_default = False,
3434
visibility = ["//visibility:public"],
3535
)
36+
37+
# --@rules_kotlin//kotlin/settings:experimental_build_tools_api=True
38+
bool_flag(
39+
name = "experimental_build_tools_api",
40+
build_setting_default = False,
41+
visibility = ["//visibility:public"],
42+
)

src/main/kotlin/io/bazel/kotlin/test/BazelIntegrationTestRunner.kt

Lines changed: 63 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -59,64 +59,69 @@ object BazelIntegrationTestRunner {
5959
listOf(true, false).filter { bzlmod ->
6060
bzlmod && workspace.hasModule() || !bzlmod && workspace.hasWorkspace()
6161
}.forEach { bzlmod ->
62-
println("Starting bzlmod $bzlmod test")
63-
val overrideFlag = if (bzlmod) "--override_module=rules_kotlin=$unpack" else "--override_repository=rules_kotlin=$unpack"
64-
bazel.run(
65-
workspace,
66-
"--bazelrc=$bazelrc",
67-
"clean",
68-
"--expunge",
69-
"--async"
70-
).onFailThrow()
71-
bazel.run(
72-
workspace,
73-
"--bazelrc=$bazelrc",
74-
"shutdown",
75-
).onFailThrow()
76-
bazel.run(
77-
workspace,
78-
"--bazelrc=$bazelrc",
79-
"info",
80-
*version.workspaceFlag(bzlmod),
81-
overrideFlag
82-
).onFailThrow()
83-
bazel.run(
84-
workspace,
85-
"--bazelrc=$bazelrc",
86-
"build",
87-
overrideFlag,
88-
"--incompatible_disallow_empty_glob=false",
89-
"//...",
90-
*version.workspaceFlag(bzlmod)
91-
).onFailThrow()
92-
bazel.run(
93-
workspace,
94-
"--bazelrc=$bazelrc",
95-
"query",
96-
overrideFlag,
97-
"--incompatible_disallow_empty_glob=false",
98-
"@rules_kotlin//...",
99-
*version.workspaceFlag(bzlmod)
100-
).onFailThrow()
101-
bazel.run(
102-
workspace,
103-
"--bazelrc=$bazelrc",
104-
"query",
105-
*version.workspaceFlag(bzlmod),
106-
overrideFlag,
107-
"--incompatible_disallow_empty_glob=false",
108-
"kind(\".*_test\", \"//...\")",
109-
).ok { process ->
110-
if (process.stdOut.isNotEmpty()) {
111-
bazel.run(
112-
workspace,
113-
"--bazelrc=$bazelrc",
114-
"test",
115-
*version.workspaceFlag(bzlmod),
116-
overrideFlag,
117-
"--test_output=all",
118-
"//...",
119-
).onFailThrow()
62+
listOf(true, false).forEach { buildToolsApi ->
63+
println("Starting bzlmod $bzlmod test")
64+
val overrideFlag =
65+
if (bzlmod) "--override_module=rules_kotlin=$unpack" else "--override_repository=rules_kotlin=$unpack"
66+
bazel.run(
67+
workspace,
68+
"--bazelrc=$bazelrc",
69+
"clean",
70+
"--expunge",
71+
"--async",
72+
).onFailThrow()
73+
bazel.run(
74+
workspace,
75+
"--bazelrc=$bazelrc",
76+
"shutdown",
77+
).onFailThrow()
78+
bazel.run(
79+
workspace,
80+
"--bazelrc=$bazelrc",
81+
"info",
82+
*version.workspaceFlag(bzlmod),
83+
overrideFlag,
84+
).onFailThrow()
85+
bazel.run(
86+
workspace,
87+
"--bazelrc=$bazelrc",
88+
"build",
89+
overrideFlag,
90+
"--incompatible_disallow_empty_glob=false",
91+
"--@rules_kotlin//kotlin/settings:experimental_build_tools_api=${buildToolsApi}",
92+
"//...",
93+
*version.workspaceFlag(bzlmod),
94+
).onFailThrow()
95+
bazel.run(
96+
workspace,
97+
"--bazelrc=$bazelrc",
98+
"query",
99+
overrideFlag,
100+
"--incompatible_disallow_empty_glob=false",
101+
"@rules_kotlin//...",
102+
*version.workspaceFlag(bzlmod),
103+
).onFailThrow()
104+
bazel.run(
105+
workspace,
106+
"--bazelrc=$bazelrc",
107+
"query",
108+
*version.workspaceFlag(bzlmod),
109+
overrideFlag,
110+
"--incompatible_disallow_empty_glob=false",
111+
"kind(\".*_test\", \"//...\")",
112+
).ok { process ->
113+
if (process.stdOut.isNotEmpty()) {
114+
bazel.run(
115+
workspace,
116+
"--bazelrc=$bazelrc",
117+
"test",
118+
*version.workspaceFlag(bzlmod),
119+
overrideFlag,
120+
"--@rules_kotlin//kotlin/settings:experimental_build_tools_api=${buildToolsApi}",
121+
"--test_output=all",
122+
"//...",
123+
).onFailThrow()
124+
}
120125
}
121126
}
122127
}

0 commit comments

Comments
 (0)