diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 9d3da6812e2..2ef5e3273c1 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -25,9 +25,9 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$gradlePluginVersion" } - ext.useCustomDist = project.hasProperty("org.jetbrains.kotlin.native.home") || project.hasProperty("konan.home") + ext.useCustomDist = project.hasProperty("konan.home") if (!useCustomDist) { - ext.setProperty("org.jetbrains.kotlin.native.home", distDir.absolutePath) + ext.setProperty("konan.home", distDir.absolutePath) } } @@ -56,10 +56,6 @@ 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") @@ -69,7 +65,7 @@ externalStdlibTestsDir.mkdirs() ext.platformManager = project.rootProject.platformManager ext.target = platformManager.targetManager(project.testTarget).target -ext.testLibraryDir = "${project.property("org.jetbrains.kotlin.native.home")}/klib/platform/${project.target.name}" +ext.testLibraryDir = "${project.property("konan.home")}/klib/platform/${project.target.name}" // Add executor to run tests depending on a target project.convention.plugins.executor = ExecutorServiceKt.create(project)