From dcbc1e6a047fd9203db458cfb1919388f76b1e07 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 15 Nov 2023 11:13:07 +0200 Subject: [PATCH] [Build] Update system properties for tests in JPS mode Property `jps.kotlin.home` in test run configuration template pointed to wrong kotlinc dist location --- .../buildsrc-compat/src/main/kotlin/jps.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts index 1911bd0b499..8aff1ccfed4 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts @@ -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",