From 0c35e79283c66d41437fccde420ed40bc032e9f0 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 21 Dec 2017 10:24:38 +0100 Subject: [PATCH] Fix idea home path usages --- compiler/build.gradle.kts | 1 + idea/build.gradle.kts | 2 +- idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 3d97c224cbf..310d1edfec7 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -86,6 +86,7 @@ projectTest { doFirst { systemProperty("ant.classpath", antLauncherJar.asPath) systemProperty("ant.launcher.class", "org.apache.tools.ant.Main") + systemProperty("idea.home.path", intellijRootDir().canonicalPath) } } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index ae7b92ba705..2b9a409094f 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -118,7 +118,7 @@ projectTest { dependsOnTaskIfExistsRec("dist", project = rootProject) workingDir = rootDir afterEvaluate { - systemProperty("ideaSdk.path", intellijRootDir().canonicalPath) + systemProperty("idea.home.path", intellijRootDir().canonicalPath) } } diff --git a/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt index 9ba2900fae8..901f56bee9f 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt @@ -55,8 +55,8 @@ class KotlinLibInjectionTest : AbstractInjectionTest() { override fun getProjectDescriptor(): LightProjectDescriptor { - val ideaSdkPath = System.getProperty("ideaSdk.path")?.takeIf { File(it).isDirectory } - ?: throw RuntimeException("Unable to get a valid path from 'ideaSdk.path' property, please point it to the Idea SDK location") + val ideaSdkPath = System.getProperty("idea.home.path")?.takeIf { File(it).isDirectory } + ?: throw RuntimeException("Unable to get a valid path from 'idea.home.path' property, please point it to the Idea location") return SdkAndMockLibraryProjectDescriptor( PluginTestCaseBase.getTestDataPathBase() + "/injection/lib/", false, false, false, true, listOf(File(ideaSdkPath, "lib/annotations.jar").absolutePath))