Skip to content

Commit 56dd628

Browse files
committed
Correctly handle empty additional CLI opts
Follow up for #315
1 parent 33a1579 commit 56dd628

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,19 @@ private val kotlin_warnings_settings = System.getProperty("kotlin_Werror_overrid
5353
} ?: false
5454

5555
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 ->
56+
val argsList = it.split(' ').map(String::trim).filter(String::isNotBlank)
57+
if (argsList.isEmpty()) {
58+
""
59+
} else {
60+
argsList.joinToString(prefix = "\"", separator = "\", \"", postfix = "\"") { opt ->
5861
opt.replace("\\", "\\\\")
5962
.replace("\n", "\\n")
6063
.replace("\t", "\\t")
6164
.replace("\b", "\\b")
6265
.replace("\r", "\\r")
6366
.replace("\"", "\\\"")
6467
}
65-
"freeCompilerArgs.addAll($args)"
68+
}
6669
} ?: ""
6770

6871
private fun generateBuildScript(kotlinVersion: String, jvmToolchain: Int) =

0 commit comments

Comments
 (0)