From 74cf792b4106ea06870e3af94e9e990961fa5498 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Tue, 1 Feb 2022 12:33:49 +0300 Subject: [PATCH] [K/N][test] Don't rebuild platform libs in non default dist if exist --- .../main/kotlin/org/jetbrains/kotlin/Utils.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt index 52571b340f1..eea006e6adf 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt @@ -116,18 +116,20 @@ fun File.dependencies() = fun Task.dependsOnPlatformLibs() { - (this as? KonanTest)?.run { - project.file(source).dependencies().forEach { - this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it") - //this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-${it}Cache") - } - if (this is KonanLinkTest) { - project.file(lib).dependencies().forEach { + if (!project.hasPlatformLibs) { + (this as? KonanTest)?.run { + project.file(source).dependencies().forEach { this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it") + //this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-${it}Cache") } - } - this.dependsOnDist() - } ?: error("unsupported task : $this") + if (this is KonanLinkTest) { + project.file(lib).dependencies().forEach { + this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it") + } + } + this.dependsOnDist() + } ?: error("unsupported task : $this") + } } @Suppress("UNCHECKED_CAST")