From a5026d60db3b844100a732382d233da9de4ed71c Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 2 Apr 2020 12:45:17 +0300
Subject: [PATCH] [Gradle, JS] Configure test executable only once

#KT-37954 fixed
---
 .../targets/js/ir/KotlinJsIrSubTarget.kt      |  8 +++----
 .../gradle/targets/js/ir/KotlinJsIrTarget.kt  | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
index 0b097347d44..41ac817dc40 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
@@ -74,10 +74,10 @@ abstract class KotlinJsIrSubTarget(
     }
 
     protected open fun configureTestRunDefaults(testRun: KotlinJsPlatformTestRun) {
-        target.compilations.matching { it.name == KotlinCompilation.TEST_COMPILATION_NAME }.all { compilation ->
-            compilation.binaries.executableIrInternal(compilation)
-            configureTestsRun(testRun, compilation)
-        }
+        target.compilations.matching { it.name == KotlinCompilation.TEST_COMPILATION_NAME }
+            .all { compilation ->
+                configureTestsRun(testRun, compilation)
+            }
     }
 
     private fun configureTestsRun(testRun: KotlinJsPlatformTestRun, compilation: KotlinJsIrCompilation) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
index baac189ee87..b3d5d619013 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
@@ -8,13 +8,10 @@ package org.jetbrains.kotlin.gradle.targets.js.ir
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator.Companion.runTaskNameSuffix
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
-import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
-import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinTargetWithBinaries
-import org.jetbrains.kotlin.gradle.plugin.removeJsCompilerSuffix
 import org.jetbrains.kotlin.gradle.targets.js.JsAggregatingExecutionSource
 import org.jetbrains.kotlin.gradle.targets.js.KotlinJsReportAggregatingTestRun
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl
@@ -62,9 +59,11 @@ constructor(
             it.description = "Run js on all configured platforms"
         }
 
+    private var testsConfigured: Boolean = false
+
     private val browserLazyDelegate = lazy {
         project.objects.newInstance(KotlinBrowserJsIr::class.java, this).also {
-            it.configure()
+            it.configureSubTarget()
             browserConfiguredHandlers.forEach { handler ->
                 handler(it)
             }
@@ -85,7 +84,7 @@ constructor(
 
     private val nodejsLazyDelegate = lazy {
         project.objects.newInstance(KotlinNodeJsIr::class.java, this).also {
-            it.configure()
+            it.configureSubTarget()
             nodejsConfiguredHandlers.forEach { handler ->
                 handler(it)
             }
@@ -105,6 +104,17 @@ constructor(
         body(nodejs)
     }
 
+    private fun KotlinJsIrSubTarget.configureSubTarget() {
+        compilations.matching { it.name == KotlinCompilation.TEST_COMPILATION_NAME }
+            .all { compilation ->
+                if (!testsConfigured) {
+                    testsConfigured = true
+                    compilation.binaries.executableIrInternal(compilation)
+                }
+            }
+        configure()
+    }
+
     override fun whenBrowserConfigured(body: KotlinJsBrowserDsl.() -> Unit) {
         if (browserLazyDelegate.isInitialized()) {
             browser(body)