diff --git a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt index 0c3e98003bd..4ce9308dd05 100644 --- a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt +++ b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt @@ -28,9 +28,6 @@ val KotlinBuildProperties.generateModularizedConfigurations: Boolean val KotlinBuildProperties.generateFullPipelineConfigurations: Boolean get() = getBoolean("kotlin.fir.modularized.fp.configurations", false) -val KotlinBuildProperties.generateAdditionalConfigurations: Boolean - get() = getBoolean("kotlin.fir.modularized.additional.configurations", false) - val KotlinBuildProperties.pathToKotlinModularizedTestData: String? get() = getOrNull("kotlin.fir.modularized.testdata.kotlin") as? String diff --git a/gradle/modularizedTestConfigurations.gradle.kts b/gradle/modularizedTestConfigurations.gradle.kts index e6ee3653753..dfa3e869801 100644 --- a/gradle/modularizedTestConfigurations.gradle.kts +++ b/gradle/modularizedTestConfigurations.gradle.kts @@ -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( Configuration(kotlinBuildProperties.pathToKotlinModularizedTestData, "Kotlin"), - Configuration(kotlinBuildProperties.pathToIntellijModularizedTestData, "IntelliJ", mapOf(useBuildFileKey to "true")), - Configuration(kotlinBuildProperties.pathToYoutrackModularizedTestData, "YouTrack", mapOf(languageVersionKey to "1.5")), - Configuration(kotlinBuildProperties.pathToSpaceModularizedTestData, "Space", mapOf(languageVersionKey to "1.6")) -) - -val additionalConfigurationsWithFilter = mapOf( - "Kotlin" to listOf( - "Kotlin. idea.main module" to ".*/idea/build/.*/main", - ) + Configuration(kotlinBuildProperties.pathToIntellijModularizedTestData, "IntelliJ"), + Configuration(kotlinBuildProperties.pathToYoutrackModularizedTestData, "YouTrack"), + Configuration(kotlinBuildProperties.pathToSpaceModularizedTestData, "Space") ) val generateMT = kotlinBuildProperties.generateModularizedConfigurations val generateFP = kotlinBuildProperties.generateFullPipelineConfigurations -val generateAdditionalConfigurations = kotlinBuildProperties.generateAdditionalConfigurations for ((path, projectName, additionalParameters) in testDataPathList) { rootProject.afterEvaluate { val configurations = mutableListOf>( "Full $projectName" to null ) - if (generateAdditionalConfigurations) { - additionalConfigurationsWithFilter[projectName]?.let { - configurations.addAll(it) - } - } val jpsBuildEnabled = kotlinBuildProperties.isInJpsBuildIdeaSync