Skip to content

Commit 00fa8ee

Browse files
committed
Setup JRE version for codegen tests
Add camelCase task name aliases for codegen tests
1 parent 43e2be2 commit 00fa8ee

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

compiler/build.gradle.kts

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,36 +82,47 @@ projectTest {
8282

8383
evaluationDependsOn(":compiler:tests-common-jvm6")
8484

85-
fun Project.codegenTest(taskName: String, body: Test.() -> Unit): Test = projectTest(taskName) {
85+
fun Project.codegenTest(taskName: String, jdk: String, body: Test.() -> Unit): Test = projectTest(taskName) {
8686
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
8787
workingDir = rootDir
8888
environment("TEST_SERVER_CLASSES_DIRS", project(":compiler:tests-common-jvm6").the<JavaPluginConvention>().sourceSets.getByName("main").output.classesDirs.asPath)
8989
filter.includeTestsMatching("org.jetbrains.kotlin.codegen.CodegenJdkCommonTestSuite*")
90+
91+
if (jdk == "JDK_9") {
92+
jvmArgs = listOf("--add-opens", "java.desktop/javax.swing=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED")
93+
}
9094
body()
95+
doFirst {
96+
val jdkPath = project.property(jdk) ?: error("$jdk is not optional to run this test")
97+
executable = "$jdkPath/bin/java"
98+
println("Running test with $executable")
99+
}
100+
}.also {
101+
task(taskName.replace(Regex("-[a-z]"), { it.value.takeLast(1).toUpperCase() })) {
102+
dependsOn(it)
103+
group = "verification"
104+
}
91105
}
92106

93-
codegenTest("codegen-target6-jvm6-test") {
107+
codegenTest("codegen-target6-jvm6-test", "JDK_18") {
94108
systemProperty("kotlin.test.default.jvm.target", "1.6")
95109
systemProperty("kotlin.test.java.compilation.target", "1.6")
96110
systemProperty("kotlin.test.box.in.separate.process.port", "5100")
97111
}
98112

99-
codegenTest("codegen-target6-jvm9-test") {
113+
codegenTest("codegen-target6-jvm9-test", "JDK_9") {
100114
systemProperty("kotlin.test.default.jvm.target", "1.6")
101-
jvmArgs = listOf("--add-opens", "java.desktop/javax.swing=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED")
102115
}
103116

104-
codegenTest("codegen-target8-jvm8-test") {
117+
codegenTest("codegen-target8-jvm8-test", "JDK_18") {
105118
systemProperty("kotlin.test.default.jvm.target", "1.8")
106119
}
107120

108-
codegenTest("codegen-target8-jvm9-test") {
121+
codegenTest("codegen-target8-jvm9-test", "JDK_9") {
109122
systemProperty("kotlin.test.default.jvm.target", "1.8")
110-
jvmArgs = listOf("--add-opens", "java.desktop/javax.swing=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED")
111123
}
112124

113-
codegenTest("codegen-target9-jvm9-test") {
125+
codegenTest("codegen-target9-jvm9-test", "JDK_9") {
114126
systemProperty("kotlin.test.default.jvm.target", "1.8")
115127
systemProperty("kotlin.test.substitute.bytecode.1.8.to.1.9", "true")
116-
jvmArgs = listOf("--add-opens", "java.desktop/javax.swing=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED")
117128
}

0 commit comments

Comments
 (0)