Skip to content

Commit 33a1579

Browse files
authored
Pass kotlin_Werror_override and kotlin_additional_cli_options to int tests (#316)
Closes #315
1 parent e6a518c commit 33a1579

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

integration/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,8 @@ tasks.test {
3838
}
3939
systemProperty("minSupportedGradleVersion", libs.versions.minSupportedGradle.get())
4040
systemProperty("minSupportedKotlinVersion", libs.versions.minSupportedKotlin.get())
41+
systemProperty("kotlin_Werror_override", if (getAllWarningsAsErrorsValue(project)) "enable" else "disable")
42+
project.providers.gradleProperty("kotlin_additional_cli_options").orNull?.let {
43+
systemProperty("kotlin_additional_cli_options", it)
44+
}
4145
}

integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@ private val kotlin_api_version = System.getProperty("kotlin_api_version")?.let {
4545
"apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.fromVersion('$it')"
4646
}.orEmpty()
4747

48+
private val kotlin_warnings_settings = System.getProperty("kotlin_Werror_override")?.let {
49+
when (it) {
50+
"disable" -> "freeCompilerArgs.addAll(\"-Wextra\", \"-Xuse-fir-experimental-checkers\")"
51+
else -> "allWarningsAsErrors = true"
52+
}
53+
} ?: false
54+
55+
private val kotlin_additional_cli_options = System.getProperty("kotlin_additional_cli_options")?.let {
56+
val args = it.split(' ').map(String::trim).filter(String::isNotBlank)
57+
.joinToString(prefix = "\"", separator = "\", \"", postfix = "\"") { opt ->
58+
opt.replace("\\", "\\\\")
59+
.replace("\n", "\\n")
60+
.replace("\t", "\\t")
61+
.replace("\b", "\\b")
62+
.replace("\r", "\\r")
63+
.replace("\"", "\\\"")
64+
}
65+
"freeCompilerArgs.addAll($args)"
66+
} ?: ""
67+
4868
private fun generateBuildScript(kotlinVersion: String, jvmToolchain: Int) =
4969
"""
5070
buildscript {
@@ -86,7 +106,8 @@ private fun generateBuildScript(kotlinVersion: String, jvmToolchain: Int) =
86106
$kotlin_api_version
87107
88108
progressiveMode = true
89-
allWarningsAsErrors = true
109+
$kotlin_warnings_settings
110+
$kotlin_additional_cli_options
90111
}
91112
}
92113
""".trimIndent()

0 commit comments

Comments
 (0)