[Gradle, Native, IT] Allow checking compiler classpath
This commit is contained in:
committed by
Space
parent
0fd4884149
commit
f049c4a630
+10
@@ -987,6 +987,7 @@ class GeneralNativeIT : BaseGradleIT() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private enum class NativeToolSettingsKind(val title: String) {
|
private enum class NativeToolSettingsKind(val title: String) {
|
||||||
|
COMPILER_CLASSPATH("Classpath"),
|
||||||
COMMAND_LINE_ARGUMENTS("Arguments"),
|
COMMAND_LINE_ARGUMENTS("Arguments"),
|
||||||
CUSTOM_ENV_VARIABLES("Custom ENV variables")
|
CUSTOM_ENV_VARIABLES("Custom ENV variables")
|
||||||
}
|
}
|
||||||
@@ -1025,6 +1026,9 @@ class GeneralNativeIT : BaseGradleIT() {
|
|||||||
fun CompiledProject.extractNativeCommandLineArguments(taskPath: String? = null, toolName: String): List<String> =
|
fun CompiledProject.extractNativeCommandLineArguments(taskPath: String? = null, toolName: String): List<String> =
|
||||||
extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.COMMAND_LINE_ARGUMENTS).toList()
|
extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.COMMAND_LINE_ARGUMENTS).toList()
|
||||||
|
|
||||||
|
fun CompiledProject.extractNativeCompilerClasspath(taskPath: String? = null, toolName: String): List<String> =
|
||||||
|
extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.COMPILER_CLASSPATH).toList()
|
||||||
|
|
||||||
fun CompiledProject.extractNativeCustomEnvironment(taskPath: String? = null, toolName: String): Map<String, String> =
|
fun CompiledProject.extractNativeCustomEnvironment(taskPath: String? = null, toolName: String): Map<String, String> =
|
||||||
extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.CUSTOM_ENV_VARIABLES).map {
|
extractNativeToolSettings(toolName, taskPath, NativeToolSettingsKind.CUSTOM_ENV_VARIABLES).map {
|
||||||
val (key, value) = it.split("=")
|
val (key, value) = it.split("=")
|
||||||
@@ -1037,6 +1041,12 @@ class GeneralNativeIT : BaseGradleIT() {
|
|||||||
check: (List<String>) -> Unit
|
check: (List<String>) -> Unit
|
||||||
) = taskPaths.forEach { taskPath -> check(extractNativeCommandLineArguments(taskPath, toolName)) }
|
) = taskPaths.forEach { taskPath -> check(extractNativeCommandLineArguments(taskPath, toolName)) }
|
||||||
|
|
||||||
|
fun CompiledProject.checkNativeCompilerClasspath(
|
||||||
|
vararg taskPaths: String,
|
||||||
|
toolName: String = "konanc",
|
||||||
|
check: (List<String>) -> Unit
|
||||||
|
) = taskPaths.forEach { taskPath -> check(extractNativeCompilerClasspath(taskPath, toolName)) }
|
||||||
|
|
||||||
fun CompiledProject.checkNativeCustomEnvironment(
|
fun CompiledProject.checkNativeCustomEnvironment(
|
||||||
vararg taskPaths: String,
|
vararg taskPaths: String,
|
||||||
toolName: String = "konanc",
|
toolName: String = "konanc",
|
||||||
|
|||||||
+1
-1
@@ -116,7 +116,7 @@ internal abstract class KotlinToolRunner(
|
|||||||
project.logger.info(
|
project.logger.info(
|
||||||
"""|Run in-process tool "$displayName"
|
"""|Run in-process tool "$displayName"
|
||||||
|Entry point method = $mainClass.$daemonEntryPoint
|
|Entry point method = $mainClass.$daemonEntryPoint
|
||||||
|Classpath = ${classpath.joinToString(File.pathSeparator) { it.absolutePath }}
|
|Classpath = ${classpath.map { it.absolutePath }.toPrettyString()}
|
||||||
|Arguments = ${args.toPrettyString()}
|
|Arguments = ${args.toPrettyString()}
|
||||||
|Transformed arguments = ${if (transformedArgs == args) "same as arguments" else transformedArgs.toPrettyString()}
|
|Transformed arguments = ${if (transformedArgs == args) "same as arguments" else transformedArgs.toPrettyString()}
|
||||||
""".trimMargin()
|
""".trimMargin()
|
||||||
|
|||||||
Reference in New Issue
Block a user