azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Update system properties for tests in JPS mode

Browse Source 
Property `jps.kotlin.home` in test run configuration template pointed
  to wrong kotlinc dist location
This commit is contained in:
Dmitriy Novozhilov
2023-11-15 11:13:07 +02:00
committed by Space Team
parent 6f3204da0a
commit dcbc1e6a04
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts
+4 -4
View File
@@ -8,10 +8,10 @@ import org.jetbrains.gradle.ext.TopLevelArtifact
import org.jetbrains.kotlin.ideaExt.* import org.jetbrains.kotlin.ideaExt.*
val ideaPluginDir: File by extra
val ideaSandboxDir: File by extra
val ideaSdkPath: String val ideaSdkPath: String
get() = rootProject.ideaHomePathForTests().absolutePath get() = rootProject.ideaHomePathForTests().absolutePath
val distDir by extra("$rootDir/dist")
val distKotlinHomeDir by extra("$distDir/kotlinc")
fun updateCompilerXml() { fun updateCompilerXml() {
val modulesExcludedFromJps = listOf( val modulesExcludedFromJps = listOf(
@@ -104,10 +104,10 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") {
"-Didea.ignore.disabled.plugins=true", "-Didea.ignore.disabled.plugins=true",
"-Didea.home.path=$ideaSdkPath", "-Didea.home.path=$ideaSdkPath",
"-Didea.use.native.fs.for.win=false", "-Didea.use.native.fs.for.win=false",
"-Djps.kotlin.home=${ideaPluginDir.absolutePath}", "-Djps.kotlin.home=${File(distKotlinHomeDir).absolutePath}",
"-Duse.jps=true", "-Duse.jps=true",
"-Djava.awt.headless=true" "-Djava.awt.headless=true"
).filterNotNull().joinToString(" ") ).joinToString(" ")
envs = mapOf( envs = mapOf(
"NO_FS_ROOTS_ACCESS_CHECK" to "true", "NO_FS_ROOTS_ACCESS_CHECK" to "true",