From e18a124cbb6b39412c22dd2c227e48b3084a657f Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 21 Oct 2023 02:44:36 +0200
Subject: [PATCH] [stdlib] Import kotlin-test-common sources as a part of
 native stdlib

---
 libraries/stdlib/build.gradle.kts | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index 3886cd6ae81..abb918a31be 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -268,6 +268,10 @@ kotlin {
     }
 
     sourceSets {
+        fun <TP : TaskProvider<*>> TP.requiredForImport(): TP {
+            tasks.findByName("prepareKotlinIdeaImport")?.dependsOn(this)
+            return this
+        }
         all {
             kotlin.setSrcDirs(emptyList<File>())
         }
@@ -347,7 +351,7 @@ kotlin {
         val jsMain by getting {
             val prepareJsIrMainSources by tasks.registering(Sync::class)
             kotlin {
-                srcDir(prepareJsIrMainSources)
+                srcDir(prepareJsIrMainSources.requiredForImport())
                 srcDir("$jsDir/builtins")
                 srcDir("$jsDir/runtime")
                 srcDir("$jsDir/src").apply {
@@ -426,7 +430,7 @@ kotlin {
             dependsOn(nativeWasmMain)
             val prepareWasmBuiltinSources by tasks.registering(Sync::class)
             kotlin {
-                srcDir(prepareWasmBuiltinSources)
+                srcDir(prepareWasmBuiltinSources.requiredForImport())
                 srcDir("wasm/builtins")
                 srcDir("wasm/internal")
                 srcDir("wasm/runtime")
@@ -511,8 +515,21 @@ kotlin {
         }
 
         if (kotlinBuildProperties.isInIdeaSync) {
+            val nativeKotlinTestCommon by creating {
+                dependsOn(commonMain.get())
+                val prepareKotlinTestCommonNativeSources by tasks.registering(Sync::class) {
+                    from("../kotlin.test/common/src/main/kotlin")
+                    from("../kotlin.test/annotations-common/src/main/kotlin")
+                    into("$buildDir/src/native-kotlin-test-common-sources")
+                }
+
+                kotlin {
+                    srcDir(prepareKotlinTestCommonNativeSources.requiredForImport())
+                }
+            }
             val nativeMain by getting {
                 dependsOn(nativeWasmMain)
+                dependsOn(nativeKotlinTestCommon)
                 kotlin {
                     srcDir("$rootDir/kotlin-native/runtime/src/main/kotlin")
                     srcDir("$rootDir/kotlin-native/Interop/Runtime/src/main/kotlin")