diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt index 4be97dc9599..76362525187 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt @@ -19,7 +19,8 @@ data class ModuleData( val qualifiedName: String, val classpath: List, val sources: List, - val javaSourceRoots: List + val javaSourceRoots: List, + val isCommon: Boolean ) private fun NodeList.toList(): List { @@ -58,6 +59,7 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() { val javaSourceRoots = mutableListOf() val classpath = mutableListOf() val sources = mutableListOf() + var isCommon = false for (index in 0 until moduleElement.childNodes.length) { val item = moduleElement.childNodes.item(index) @@ -74,9 +76,12 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() { if (item.nodeName == "sources") { sources += File(item.attributes.getNamedItem("path").nodeValue) } + if (item.nodeName == "commonSources") { + isCommon = true + } } - return ModuleData(moduleName, outputDir, qualifiedModuleName, classpath, sources, javaSourceRoots) + return ModuleData(moduleName, outputDir, qualifiedModuleName, classpath, sources, javaSourceRoots, isCommon) } @@ -95,6 +100,7 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() { val modules = root.listFiles().sortedBy { it.lastModified() }.map { loadModule(it) } .filter { it.outputDir.matches(filterRegex) } + .filter { !it.isCommon } for (module in modules.progress(step = 0.0) { "Analyzing ${it.qualifiedName}" }) {