azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Native, Gradle IT: Fix GeneralNativeIT.testNativeArgsWithSpaces()

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-11-11 14:15:53 +03:00
parent 0fe842c38f
commit bf0156f7c6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
+2 -1
View File
@@ -818,7 +818,8 @@ class GeneralNativeIT : BaseGradleIT() {
build("compileKotlin${nativeHostTargetName.capitalize()}") { build("compileKotlin${nativeHostTargetName.capitalize()}") {
assertSuccessful() assertSuccessful()
checkNativeCommandLineArguments(":compileKotlin${nativeHostTargetName.capitalize()}") { arguments -> checkNativeCommandLineArguments(":compileKotlin${nativeHostTargetName.capitalize()}") { arguments ->
val escapedQuotedPath = "\"${fileWithSpacesInPath.absolutePath.replace("\"", "\\\"")}\"" val escapedQuotedPath =
"\"${fileWithSpacesInPath.absolutePath.replace("\\", "\\\\").replace("\"", "\\\"")}\""
assertTrue( assertTrue(
escapedQuotedPath in arguments, escapedQuotedPath in arguments,
""" """
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt
+5 -1
View File
@@ -151,6 +151,10 @@ internal abstract class KotlinToolRunner(
} }
private fun String.toPrettyString(): String = private fun String.toPrettyString(): String =
if (isEmpty()) "\"\"" else escapeStringCharacters(this).let { if (any(Char::isWhitespace)) "\"$it\"" else it } when {
isEmpty() -> "\"\""
any { it == '"' || it.isWhitespace() } -> '"' + escapeStringCharacters(this) + '"'
else -> this
}
} }
} }