From 4c9449daf409e2996912b8d27adf887c1d0d33b1 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Tue, 2 Jun 2020 13:08:12 +0300
Subject: [PATCH] Fix dependencies and docs

---
 backend.native/tests/build.gradle                           | 3 ++-
 .../src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt   | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index f611029cd78..9fd3f6dd80a 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -4030,6 +4030,7 @@ Task frameworkTest(String name, Closure<FrameworkTest> configurator) {
                         baseDir "$testOutputFramework/${task.name}"
 
                         if (fr.library != null) {
+                            dependsOn konanArtifacts[fr.library].getByTarget(target.name)
                             libraries {
                                 file konanArtifacts[fr.library].getArtifactByTarget(target.name)
                             }
@@ -4056,7 +4057,7 @@ Task frameworkTest(String name, Closure<FrameworkTest> configurator) {
 if (isAppleTarget(project)) {
     frameworkTest('testObjCExport') {
         final String frameworkName = 'Kt'
-        final String dir = "$testOutputFramework/$name"
+        final String dir = "$testOutputFramework/testObjCExport"
         final File lazyHeader = file("$dir/$target-lazy.h")
 
         doLast {
diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
index c4f5f8487b6..e5ee1649daf 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
@@ -42,6 +42,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
 
     /**
      * Framework description.
+     *
      * @param name is the framework name,
      * @param sources framework sources,
      * @param bitcode bitcode embedding in the framework,
@@ -58,6 +59,9 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
             var opts: List<String> = emptyList()
     )
 
+    /**
+     * Used for the framework configuration in the task's closure.
+     */
     fun framework(name: String, closure: Closure<Framework>): Framework {
         val f = Framework(name).apply {
             closure.delegate = this
@@ -79,7 +83,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
     }
 
     fun Language.filesFrom(dir: String): FileTree = project.fileTree(dir) {
-        // include only files with 
+        // include only files with the language extension
         it.include("*${this.extension}")
     }