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

Modularized tests. Remove obsolete parameters from run configurations

Browse Source 
^KT-56075
This commit is contained in:
Simon Ogorodnik
2023-02-13 14:32:24 +01:00
committed by Space Team
parent a69bc5939f
commit 0193c83b05
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/BuildPropertiesExt.kt
-3
View File
@@ -28,9 +28,6 @@ val KotlinBuildProperties.generateModularizedConfigurations: Boolean
val KotlinBuildProperties.generateFullPipelineConfigurations: Boolean val KotlinBuildProperties.generateFullPipelineConfigurations: Boolean
get() = getBoolean("kotlin.fir.modularized.fp.configurations", false) get() = getBoolean("kotlin.fir.modularized.fp.configurations", false)
val KotlinBuildProperties.generateAdditionalConfigurations: Boolean
get() = getBoolean("kotlin.fir.modularized.additional.configurations", false)
val KotlinBuildProperties.pathToKotlinModularizedTestData: String? val KotlinBuildProperties.pathToKotlinModularizedTestData: String?
get() = getOrNull("kotlin.fir.modularized.testdata.kotlin") as? String get() = getOrNull("kotlin.fir.modularized.testdata.kotlin") as? String
gradle/modularizedTestConfigurations.gradle.kts
+3 -18
View File
@@ -142,36 +142,21 @@ data class Configuration(val path: String, val name: String, val additionalParam
} }
} }
val languageVersionKey = "fir.bench.language.version"
val useBuildFileKey = "fir.bench.use.build.file"
val testDataPathList = listOfNotNull( val testDataPathList = listOfNotNull(
Configuration(kotlinBuildProperties.pathToKotlinModularizedTestData, "Kotlin"), Configuration(kotlinBuildProperties.pathToKotlinModularizedTestData, "Kotlin"),
Configuration(kotlinBuildProperties.pathToIntellijModularizedTestData, "IntelliJ", mapOf(useBuildFileKey to "true")), Configuration(kotlinBuildProperties.pathToIntellijModularizedTestData, "IntelliJ"),
Configuration(kotlinBuildProperties.pathToYoutrackModularizedTestData, "YouTrack", mapOf(languageVersionKey to "1.5")), Configuration(kotlinBuildProperties.pathToYoutrackModularizedTestData, "YouTrack"),
Configuration(kotlinBuildProperties.pathToSpaceModularizedTestData, "Space", mapOf(languageVersionKey to "1.6")) Configuration(kotlinBuildProperties.pathToSpaceModularizedTestData, "Space")
)
val additionalConfigurationsWithFilter = mapOf(
"Kotlin" to listOf(
"Kotlin. idea.main module" to ".*/idea/build/.*/main",
)
) )
val generateMT = kotlinBuildProperties.generateModularizedConfigurations val generateMT = kotlinBuildProperties.generateModularizedConfigurations
val generateFP = kotlinBuildProperties.generateFullPipelineConfigurations val generateFP = kotlinBuildProperties.generateFullPipelineConfigurations
val generateAdditionalConfigurations = kotlinBuildProperties.generateAdditionalConfigurations
for ((path, projectName, additionalParameters) in testDataPathList) { for ((path, projectName, additionalParameters) in testDataPathList) {
rootProject.afterEvaluate { rootProject.afterEvaluate {
val configurations = mutableListOf<Pair<String, String?>>( val configurations = mutableListOf<Pair<String, String?>>(
"Full $projectName" to null "Full $projectName" to null
) )
if (generateAdditionalConfigurations) {
additionalConfigurationsWithFilter[projectName]?.let {
configurations.addAll(it)
}
}
val jpsBuildEnabled = kotlinBuildProperties.isInJpsBuildIdeaSync val jpsBuildEnabled = kotlinBuildProperties.isInJpsBuildIdeaSync