From 772c48e61ecb9ddd7f0a2468207cfeb639dddcd0 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Sun, 22 Apr 2018 18:37:28 +0700
Subject: [PATCH] Make some test tasks depending on dist

---
 backend.native/tests/build.gradle | 10 +++++++++-
 klib/build.gradle                 | 12 ++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 21f36d02981..4bb0255e88b 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -2664,7 +2664,7 @@ static String outputPath(SourceSet set) {
 }
 
 if (isMac() && project.testTarget != 'wasm32') {
-    def target = project.testTarget ?: 'host'
+    def target = ext.platformManager.targetByName(project.testTarget ?: 'host').name
 
     task testValuesFramework(type: FrameworkTest) {
         frameworkName = 'Values'
@@ -2672,6 +2672,10 @@ if (isMac() && project.testTarget != 'wasm32') {
             framework(frameworkName, targets: [ target ]) {
                 srcDir 'framework/values'
                 baseDir outputPath(sourceSets.testOutputFramework) + "/$frameworkName"
+
+                if (!useCustomDist) {
+                    dependsOn ":${target}CrossDistRuntime", ':commonDistRuntime', ':distCompiler'
+                }
             }
         }
         swiftSources = ['framework/values/values.swift']
@@ -2684,6 +2688,10 @@ if (isMac() && project.testTarget != 'wasm32') {
             framework(frameworkName, targets: [ target ]) {
                 srcDir 'framework/stdlib'
                 baseDir outputPath(sourceSets.testOutputFramework) + "/$frameworkName"
+
+                if (!useCustomDist) {
+                    dependsOn ":${target}CrossDistRuntime", ':commonDistRuntime', ':distCompiler'
+                }
             }
         }
         swiftSources = ['framework/stdlib/stdlib.swift']
diff --git a/klib/build.gradle b/klib/build.gradle
index 739c6a9c91a..9998c94d0d8 100644
--- a/klib/build.gradle
+++ b/klib/build.gradle
@@ -20,7 +20,8 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin"
     }
 
-    if (!hasProperty("konan.home")) {
+    ext.useCustomDist = project.hasProperty("konan.home")
+    if (!useCustomDist) {
         ext.setProperty("konan.home", distDir.absolutePath)
     }
 }
@@ -34,7 +35,14 @@ konanArtifacts {
     }
     testFiles.files.each { file ->
         def name = file.name
-        library(name.take(name.lastIndexOf('.'))) { srcFiles file.absolutePath }
+        library(name.take(name.lastIndexOf('.'))) {
+            srcFiles file.absolutePath
+
+            // Build the compiler before building the test unless a custom path to the distribution is specified.
+            if (!useCustomDist) {
+                dependsOn ':dist'
+            }
+        }
     }
 }