Build: Use fake ideaHome for tests with intellij build number only
#KTI-82
This commit is contained in:
committed by
teamcity
parent
516e54a434
commit
944c7990a1
@@ -108,7 +108,9 @@ val jmhCompile by tasks.registering(JavaCompile::class) {
|
||||
}
|
||||
|
||||
val jmhExec by tasks.registering(JavaExec::class) {
|
||||
dependsOn(":createIdeaHomeForTests")
|
||||
dependsOn(tasks["compileTestJava"])
|
||||
|
||||
doFirst {
|
||||
classpath = files(
|
||||
tasks["compactClasspath"].outputs.files.singleFile.absolutePath,
|
||||
@@ -120,7 +122,7 @@ val jmhExec by tasks.registering(JavaExec::class) {
|
||||
main = "org.openjdk.jmh.Main"
|
||||
|
||||
workingDir = rootDir
|
||||
systemProperty("idea.home.path", project.intellijRootDir().absolutePath)
|
||||
systemProperty("idea.home.path", project.ideaHomePathForTests().absolutePath)
|
||||
systemProperty("idea.max.intellisense.filesize", 5000 * 1024)
|
||||
configurations.plusAssign(project.configurations["api"])
|
||||
}
|
||||
|
||||
@@ -25,7 +25,6 @@ projectTest(parallel = true) {
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
|
||||
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
|
||||
}
|
||||
|
||||
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJava8TestsKt")
|
||||
|
||||
Reference in New Issue
Block a user