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

[FIR] Add ability to specify module name in modularized test

Browse Source 
Use `fir.bench.filter.name` property to specify module name instead of
  module path regex
This commit is contained in:
Dmitriy Novozhilov
2022-04-03 17:49:02 +04:00
committed by teamcity
parent d7d86a0e95
commit 51bd0fd2db
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt
+6 -3
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot
import org.jetbrains.kotlin.cli.common.setupLanguageVersionSettings
import org.jetbrains.kotlin.cli.jvm.config.configureJdkClasspathRoots import org.jetbrains.kotlin.cli.jvm.config.configureJdkClasspathRoots
import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
@@ -63,7 +62,9 @@ private fun NodeList.toList(): List<Node> {
private val Node.childNodesList get() = childNodes.toList() private val Node.childNodesList get() = childNodes.toList()
private val ROOT_PATH_PREFIX = System.getProperty("fir.bench.prefix", "/") private val ROOT_PATH_PREFIX:String = System.getProperty("fir.bench.prefix", "/")
private val OUTPUT_DIR_REGEX_FILTER:String = System.getProperty("fir.bench.filter", ".*")
private val MODULE_NAME_FILTER: String? = System.getProperty("fir.bench.filter.name")
abstract class AbstractModularizedTest : KtUsefulTestCase() { abstract class AbstractModularizedTest : KtUsefulTestCase() {
private val folderDateFormat = SimpleDateFormat("yyyy-MM-dd") private val folderDateFormat = SimpleDateFormat("yyyy-MM-dd")
@@ -195,13 +196,15 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() {
println("BASE PATH: ${root.absolutePath}") println("BASE PATH: ${root.absolutePath}")
val filterRegex = (System.getProperty("fir.bench.filter") ?: ".*").toRegex() val filterRegex = OUTPUT_DIR_REGEX_FILTER.toRegex()
val moduleName = MODULE_NAME_FILTER
val files = root.listFiles() ?: emptyArray() val files = root.listFiles() ?: emptyArray()
val modules = files.filter { it.extension == "xml" } val modules = files.filter { it.extension == "xml" }
.sortedBy { it.lastModified() } .sortedBy { it.lastModified() }
.map { loadModule(it) } .map { loadModule(it) }
.sortedBy { it.timestamp } .sortedBy { it.timestamp }
.filter { it.rawOutputDir.matches(filterRegex) } .filter { it.rawOutputDir.matches(filterRegex) }
.filter { (moduleName == null) || it.name == moduleName }
.filter { !it.isCommon } .filter { !it.isCommon }