From ce45df2c9688bfdb4708370f6b1881d02341e8a4 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 12 Dec 2019 16:45:02 +0700
Subject: [PATCH] Gradle, tests: Skip building in native binaries test for
 Groovy DSL

This test is one of the most time-consuming tests because
it builds a lot of final native binaries. Moreover, it exists
in two versions: for Groovy DSL and for Kotlin DSL. The only
difference between these versions is build script DSL.

This patch disables project building for the Groovy DSL version to
reduce total test execution time. Now this test only checks that
project configuration is successful. But it's enough to detect DSL
problems.
---
 .../kotlin/gradle/NewMultiplatformIT.kt       | 30 +++++++++++++------
 .../targets/native/tasks/KotlinNativeTasks.kt |  3 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
index 3180a0019af..a8741cfa418 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
@@ -999,10 +999,22 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testNativeBinaryKotlinDSL() = doTestNativeBinaryDSL("kotlin-dsl")
+    fun testNativeBinaryGroovyDSL() {
+        // Building K/N binaries is very time-consuming. So we check building only for Kotlin DSL.
+        // For Groovy DSl we just check that a project can be configured.
+        val project = transformProjectWithPluginsDsl(
+            "groovy-dsl", gradleVersion, "new-mpp-native-binaries"
+        )
+        project.build("tasks") {
+            assertSuccessful()
 
-    @Test
-    fun testNativeBinaryGroovyDSL() = doTestNativeBinaryDSL("groovy-dsl")
+            // Check that getters work fine.
+            val hostSuffix = nativeHostTargetName.capitalize()
+            assertTrue(output.contains("Check link task: linkReleaseShared$hostSuffix"))
+            assertTrue(output.contains("Check run task: runFooReleaseExecutable$hostSuffix"))
+        }
+
+    }
 
     private fun CompiledProject.checkNativeCommandLineFor(vararg taskPaths: String, check: (String) -> Unit) = taskPaths.forEach { taskPath ->
         val commandLine = output.lineSequence().dropWhile {
@@ -1013,10 +1025,10 @@ class NewMultiplatformIT : BaseGradleIT() {
         check(commandLine)
     }
 
-    private fun doTestNativeBinaryDSL(
-        projectName: String,
-        gradleVersionRequired: GradleVersionRequired = gradleVersion
-    ) = with(transformProjectWithPluginsDsl(projectName, gradleVersionRequired, "new-mpp-native-binaries")) {
+    @Test
+    fun testNativeBinaryKotlinDSL() = with(
+        transformProjectWithPluginsDsl("kotlin-dsl", gradleVersion, "new-mpp-native-binaries")
+    ) {
 
         val hostSuffix = nativeHostTargetName.capitalize()
         val binaries = mutableListOf(
@@ -1204,7 +1216,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     // Check that we still can build binaries from sources if the corresponding property is specified.
-    // TODO: Drop in 1.3.70.
+    // TODO: Drop in 1.4
     @Test
     fun testLinkNativeBinaryFromSources() = with(
         transformProjectWithPluginsDsl("groovy-dsl", gradleVersion, "new-mpp-native-binaries")
@@ -1307,7 +1319,7 @@ class NewMultiplatformIT : BaseGradleIT() {
             }
         }
     }
-    
+
     private fun getBootedSimulators(workingDirectory: File): Set<String>? =
         if (HostManager.hostIsMac) {
             val simulators = runProcess(listOf("xcrun", "simctl", "list"), workingDirectory, System.getenv()).also {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 496f7cd3ebb..0d4b3de2dad 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -404,7 +404,8 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile<KotlinCommonToolOption
     override fun getSource(): FileTree =
         if (linkFromSources) {
             // Allow a user to force the old behaviour of a link task.
-            // TODO: Remove in 1.3.70.
+            // It's better to keep this flag in 1.3.70 to be able to workaroud probable klib serialization bugs.
+            // TODO: Remove in 1.4.
             project.files(compilation.allSources).asFileTree
         } else {
             project.files(intermediateLibrary.get()).asFileTree