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

Native, Gradle IT: Add verbosity to IT

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-11-06 23:13:28 +03:00
parent 9adc1a6e9b
commit 9f0cec3443
1 changed files with 12 additions and 4 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
+12 -4
View File
@@ -819,7 +819,15 @@ class GeneralNativeIT : BaseGradleIT() {
assertSuccessful() assertSuccessful()
checkNativeCommandLineArguments(":compileKotlin${nativeHostTargetName.capitalize()}") { arguments -> checkNativeCommandLineArguments(":compileKotlin${nativeHostTargetName.capitalize()}") { arguments ->
val escapedQuotedPath = "\"${fileWithSpacesInPath.absolutePath.replace("\"", "\\\"")}\"" val escapedQuotedPath = "\"${fileWithSpacesInPath.absolutePath.replace("\"", "\\\"")}\""
assertTrue(escapedQuotedPath in arguments) assertTrue(
escapedQuotedPath in arguments,
"""
Command-line arguments do not contain path with spaces.
Raw path = ${fileWithSpacesInPath.absolutePath}
Escaped quoted path = escapedQuotedPath
Arguments: ${arguments.joinToString(separator = " ")}
""".trimIndent()
)
} }
} }
} }
@@ -836,17 +844,17 @@ class GeneralNativeIT : BaseGradleIT() {
if (taskPath != null) dropWhile { "Executing actions for task '$taskPath'" !in it }.drop(1) else this if (taskPath != null) dropWhile { "Executing actions for task '$taskPath'" !in it }.drop(1) else this
} }
.dropWhile { .dropWhile {
check(taskPath == null || "Executing actions for task" !in it) check(taskPath == null || "Executing actions for task" !in it) { "Unexpected log line with new Gradle task: $it" }
"Run in-process tool \"$toolName\"" !in it && "Run \"$toolName\" tool in a separate JVM process" !in it "Run in-process tool \"$toolName\"" !in it && "Run \"$toolName\" tool in a separate JVM process" !in it
} }
.drop(1) .drop(1)
.dropWhile { .dropWhile {
check(taskPath == null || "Executing actions for task" !in it) check(taskPath == null || "Executing actions for task" !in it) { "Unexpected log line with new Gradle task: $it" }
"Arguments = [" !in it "Arguments = [" !in it
} }
val argumentsHeader = arguments.firstOrNull() val argumentsHeader = arguments.firstOrNull()
check(argumentsHeader != null && "Arguments = [" in argumentsHeader) check(argumentsHeader != null && "Arguments = [" in argumentsHeader) { "No arguments in $argumentsHeader" }
return if (argumentsHeader.trimEnd().endsWith(']')) return if (argumentsHeader.trimEnd().endsWith(']'))
emptyList() // no arguments emptyList() // no arguments