diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index 15ab43c66c1..67527839bfa 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -987,6 +987,7 @@ class GeneralNativeIT : BaseGradleIT() { } private enum class NativeToolSettingsKind(val title: String) { + COMPILER_CLASSPATH("Classpath"), COMMAND_LINE_ARGUMENTS("Arguments"), CUSTOM_ENV_VARIABLES("Custom ENV variables") } @@ -1025,6 +1026,9 @@ class GeneralNativeIT : BaseGradleIT() { fun CompiledProject.extractNativeCommandLineArguments(taskPath: String? = null, toolName: String): List = extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.COMMAND_LINE_ARGUMENTS).toList() + fun CompiledProject.extractNativeCompilerClasspath(taskPath: String? = null, toolName: String): List = + extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.COMPILER_CLASSPATH).toList() + fun CompiledProject.extractNativeCustomEnvironment(taskPath: String? = null, toolName: String): Map = extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.CUSTOM_ENV_VARIABLES).map { val (key, value) = it.split("=") @@ -1036,6 +1040,12 @@ class GeneralNativeIT : BaseGradleIT() { toolName: String = "konanc", check: (List) -> Unit ) = taskPaths.forEach { taskPath -> check(extractNativeCommandLineArguments(taskPath, toolName)) } + + fun CompiledProject.checkNativeCompilerClasspath( + vararg taskPaths: String, + toolName: String = "konanc", + check: (List) -> Unit + ) = taskPaths.forEach { taskPath -> check(extractNativeCompilerClasspath(taskPath, toolName)) } fun CompiledProject.checkNativeCustomEnvironment( vararg taskPaths: String, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt index ade5082660f..add34fed3ce 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt @@ -116,7 +116,7 @@ internal abstract class KotlinToolRunner( project.logger.info( """|Run in-process tool "$displayName" |Entry point method = $mainClass.$daemonEntryPoint - |Classpath = ${classpath.joinToString(File.pathSeparator) { it.absolutePath }} + |Classpath = ${classpath.map { it.absolutePath }.toPrettyString()} |Arguments = ${args.toPrettyString()} |Transformed arguments = ${if (transformedArgs == args) "same as arguments" else transformedArgs.toPrettyString()} """.trimMargin()