MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[build-scripts] Fix missing test classpath when running under Bazel in TestingTasksImpl#runTestsProcess (IJI-3309)

Browse Source 
GitOrigin-RevId: 7ab8ca54fb1aacea11c7ff824e8cf960e5f28469
This commit is contained in:
Ilia Kirianovskii
2025-12-02 23:58:49 +00:00
committed by intellij-monorepo-bot
parent e60157b0fb
commit 7dd49f107c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt
+10 -6
View File
@@ -457,12 +457,16 @@ internal class TestingTasksImpl(context: CompilationContext, private val options
val useKotlinK2 = !System.getProperty("idea.kotlin.plugin.use.k1", "false").toBoolean() ||
jvmArgs.contains("-Didea.kotlin.plugin.use.k1=false")
val mainJpsModule = context.findRequiredModule(mainModule)
val testRoots = JpsJavaExtensionService.dependencies(mainJpsModule).recursively()
.withoutSdk() // if the project requires different SDKs, they all shouldn't be added to the test classpath
.includedIn(JpsJavaClasspathKind.runtime(true))
.classes()
.roots
.filterTo(mutableListOf()) { useKotlinK2 || it.name != "kotlin.plugin.k2" }
val testRoots = context.getModuleRuntimeClasspath(mainJpsModule, forTests = true)
.map(Path::toFile)
.toMutableList()
.apply {
if (!useKotlinK2) {
val kotlinPluginK2Module = context.findRequiredModule("kotlin.plugin.k2")
removeAll(context.getModuleOutputRoots(kotlinPluginK2Module, forTests = false).map(Path::toFile))
removeAll(context.getModuleOutputRoots(kotlinPluginK2Module, forTests = true).map(Path::toFile))
}
}
if (isBootstrapSuiteDefault && !isRunningInBatchMode) {
//module with "com.intellij.TestAll" which output should be found in `testClasspath + modulePath`