Fix idea home path usages
This commit is contained in:
committed by
Vyacheslav Gerasimov
parent
2dc4769c0a
commit
0c35e79283
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ projectTest {
|
||||
dependsOnTaskIfExistsRec("dist", project = rootProject)
|
||||
workingDir = rootDir
|
||||
afterEvaluate {
|
||||
systemProperty("ideaSdk.path", intellijRootDir().canonicalPath)
|
||||
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user