From 07ba122d9688ba05615e0853e2392bba360165b2 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Wed, 21 Jun 2017 17:01:17 +0700
Subject: [PATCH] tests: Fix dependency downloading tests

---
 tools/helpers/build.gradle        | 12 +++++++-----
 tools/helpers/testData/interop.kt |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/helpers/build.gradle b/tools/helpers/build.gradle
index e1eac12ddd1..fe06132d2c3 100644
--- a/tools/helpers/build.gradle
+++ b/tools/helpers/build.gradle
@@ -67,7 +67,7 @@ sourceSets {
     }
 }
 
-def testDependencies = project.file("${sourceSets.testOutputLocal.output.dirs.singleFile.absolutePath}/dependencies")
+def testDependencies = rootProject.file('dist/dependencies')
 
 void prepareDependenciesDir(File testDependencies) {
     project.delete testDependencies
@@ -105,6 +105,9 @@ task testInteropHelper(type: RunInteropKonanTest) {
 }
 
 task testCompilerHelper(type: RunKonanTest) {
+    dependsOn jar
+    dependsOn ':dist'
+
     dependenciesDir = testDependencies
     source = "testData/main.kt"
 
@@ -123,6 +126,9 @@ task testCompilerHelper(type: RunKonanTest) {
 
 // Simple test for parallel compiler execution
 task testParallel(type: DefaultTask) {
+    dependsOn jar
+    dependsOn ':dist'
+
     for (int i=0; i<4; i++) {
         task("runParallel$i", type: RunKonanTest) {
             dependenciesDir = testDependencies
@@ -163,9 +169,5 @@ task testHelpers {
     dependsOn testInteropHelper
     dependsOn testCompilerHelper
     dependsOn testParallel
-
-    doLast {
-        delete testDependencies
-    }
 }
 
diff --git a/tools/helpers/testData/interop.kt b/tools/helpers/testData/interop.kt
index 862a4f30b33..2654255db69 100644
--- a/tools/helpers/testData/interop.kt
+++ b/tools/helpers/testData/interop.kt
@@ -5,5 +5,5 @@ fun main(args: Array<String>) {
     val statBuf = nativeHeap.alloc<statStruct>()
     val res = stat("/", statBuf.ptr)
     println(res)
-    println(statBuf.st_uid.value)
+    println(statBuf.st_uid)
 }
\ No newline at end of file