azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix kotlin.native.home property resolution in tests

Browse Source
This commit is contained in:
Pavel Punegov
2019-01-25 14:18:26 +03:00
committed by Pavel Punegov
parent 9c3a1332d5
commit c14ef35a47
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
+5 -1
View File
@@ -25,7 +25,7 @@ buildscript {
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$gradlePluginVersion" 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) { if (!useCustomDist) {
ext.setProperty("org.jetbrains.kotlin.native.home", distDir.absolutePath) 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.testOutputRoot = rootProject.file("test.output").absolutePath
ext.externalTestsDir = project.file("build/external") ext.externalTestsDir = project.file("build/external")
ext.externalStdlibTestsDir = project.file("build/stdlib_external") ext.externalStdlibTestsDir = project.file("build/stdlib_external")