From 0a25eac957ed8d0e11b64c4473c36e6ad38faff3 Mon Sep 17 00:00:00 2001
From: Alexander Shabalin <alexander.shabalin@jetbrains.com>
Date: Mon, 16 Nov 2020 09:50:14 +0300
Subject: [PATCH] Fix runtime tests dependencies (#4527)

---
 .../kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt  | 1 +
 kotlin-native/runtime/build.gradle.kts                        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt
index e6734c3e645..880fb4cb971 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/testing/native/NativeTest.kt
@@ -184,6 +184,7 @@ fun createTestTask(
                 excludeFiles = emptyList()
                 includeFiles = listOf("**/*Test.cpp", "**/*Test.mm")
                 dependsOn(it)
+                dependsOn("downloadGoogleTest")
                 compilerArgs.addAll(it.compilerArgs)
                 headersDirs += googleTestExtension.headersDirs
                 this.configureCompileToBitcode()
diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index ada106b7faa..3cbd1d847b7 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -149,7 +149,9 @@ targetList.forEach { targetName ->
                 "${targetName}Mimalloc",
                 "${targetName}OptAlloc"
             )
-    )
+    ) {
+        includeRuntime()
+    }
 
     tasks.register("${targetName}RuntimeTests") {
         dependsOn("${targetName}StdAllocRuntimeTests")