From ea6651445cf0b0412d60cc0ae9e4309ce96c9d61 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 28 Mar 2023 13:02:38 +0300
Subject: [PATCH] [Build] Fix generated run configurations for modularized
 tests with JPS

Previously it used incorrect path to dist directory, which lead to
  incorrect calculation of path for compiler plugin jars
---
 gradle/modularizedTestConfigurations.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/modularizedTestConfigurations.gradle.kts b/gradle/modularizedTestConfigurations.gradle.kts
index dfa3e869801..ba087fcd187 100644
--- a/gradle/modularizedTestConfigurations.gradle.kts
+++ b/gradle/modularizedTestConfigurations.gradle.kts
@@ -8,7 +8,7 @@ import org.jetbrains.gradle.ext.TopLevelArtifact
 import org.jetbrains.kotlin.ideaExt.*
 
 
-val ideaPluginDir: File by extra
+val distDir: String by extra
 val ideaSandboxDir: File by extra
 val ideaSdkPath: String
     get() = rootProject.ideaHomePathForTests().absolutePath
@@ -39,7 +39,7 @@ fun generateVmParametersForJpsConfiguration(path: String, additionalParameters:
         "-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(distDir).absolutePath}/kotlinc",
         "-Duse.jps=true",
         "-Djava.awt.headless=true"
     )