[Build] Update system properties for tests in JPS mode
Property `jps.kotlin.home` in test run configuration template pointed to wrong kotlinc dist location
This commit is contained in:
committed by
Space Team
parent
6f3204da0a
commit
dcbc1e6a04
@@ -8,10 +8,10 @@ import org.jetbrains.gradle.ext.TopLevelArtifact
|
||||
import org.jetbrains.kotlin.ideaExt.*
|
||||
|
||||
|
||||
val ideaPluginDir: File by extra
|
||||
val ideaSandboxDir: File by extra
|
||||
val ideaSdkPath: String
|
||||
get() = rootProject.ideaHomePathForTests().absolutePath
|
||||
val distDir by extra("$rootDir/dist")
|
||||
val distKotlinHomeDir by extra("$distDir/kotlinc")
|
||||
|
||||
fun updateCompilerXml() {
|
||||
val modulesExcludedFromJps = listOf(
|
||||
@@ -104,10 +104,10 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") {
|
||||
"-Didea.ignore.disabled.plugins=true",
|
||||
"-Didea.home.path=$ideaSdkPath",
|
||||
"-Didea.use.native.fs.for.win=false",
|
||||
"-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
|
||||
"-Djps.kotlin.home=${File(distKotlinHomeDir).absolutePath}",
|
||||
"-Duse.jps=true",
|
||||
"-Djava.awt.headless=true"
|
||||
).filterNotNull().joinToString(" ")
|
||||
).joinToString(" ")
|
||||
|
||||
envs = mapOf(
|
||||
"NO_FS_ROOTS_ACCESS_CHECK" to "true",
|
||||
|
||||
Reference in New Issue
Block a user