From ed7da870cf72273084a42f54793c37ace8fb1a23 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Thu, 23 Aug 2018 15:15:12 +0700 Subject: [PATCH] Rename test tasks for native targets --- .../kotlin/gradle/plugin/KotlinTargetConfigurator.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt index 73e939fed4f..77f83363414 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt @@ -390,11 +390,12 @@ open class KotlinNativeTargetConfigurator( } private fun Project.createTestTask(compilation: KotlinNativeCompilation, testExecutableLinkTask: KotlinNativeCompile) { - val taskName = lowerCamelCaseName("run", compilation.name, compilation.target.name) + val compilationSuffix = compilation.name.takeIf { it != KotlinCompilation.TEST_COMPILATION_NAME }.orEmpty() + val taskName = lowerCamelCaseName(compilation.target.targetName, compilationSuffix, testTaskNameSuffix) val testTask = tasks.create(taskName, RunTestExecutable::class.java).apply { group = LifecycleBasePlugin.VERIFICATION_GROUP description = "Executes Kotlin/Native unit tests from the '${compilation.name}' compilation " + - "for target '${compilation.platformType.name}'" + "for target '${compilation.target.name}'" val testExecutableProperty = testExecutableLinkTask.outputFile executable = testExecutableProperty.get().absolutePath @@ -468,6 +469,7 @@ open class KotlinNativeTargetConfigurator( buildType == NativeBuildType.DEBUG && konanTarget == HostManager.host ) { + // TODO: Refactor and move into the corresponding method of AbstractKotlinTargetConfigurator. createTestTask(compilation, linkTask) } }