From c14ef35a47cc450af0a80bb5bca8d9d393a3404e Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Fri, 25 Jan 2019 14:18:26 +0300 Subject: [PATCH] Fix kotlin.native.home property resolution in tests --- backend.native/tests/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index dd48ce0a6bb..2a0c7b1fa06 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -25,7 +25,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$gradlePluginVersion" } - ext.useCustomDist = project.hasProperty("org.jetbrains.kotlin.native.home") + ext.useCustomDist = project.hasProperty("org.jetbrains.kotlin.native.home") || project.hasProperty("konan.home") if (!useCustomDist) { ext.setProperty("org.jetbrains.kotlin.native.home", distDir.absolutePath) } @@ -56,6 +56,10 @@ dependencies { } } +if (project.hasProperty("konan.home")) { + ext.setProperty("org.jetbrains.kotlin.native.home", project.property("konan.home")) +} + ext.testOutputRoot = rootProject.file("test.output").absolutePath ext.externalTestsDir = project.file("build/external") ext.externalStdlibTestsDir = project.file("build/stdlib_external")