From 50a0dbc5920093fce6f1f6a2f9fa339f1108ac52 Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Fri, 30 Sep 2022 18:16:55 +0200 Subject: [PATCH] build scripts: missing run configuration should be a build problem, not a fatal failure (fixup) GitOrigin-RevId: 7f955e3503cc18164fcc5dd55992b7e58222be2a --- .../jetbrains/intellij/build/impl/TestingTasksImpl.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt index ee6a8330ff54..d1d42e9d43bb 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt @@ -41,10 +41,10 @@ import java.util.stream.Stream internal class TestingTasksImpl(private val context: CompilationContext, private val options: TestingOptions) : TestingTasks { private fun loadRunConfigurations(name: String): List { - val projectHome = context.paths.projectHome - val file = RunConfigurationProperties.findRunConfiguration(projectHome, name) - val configuration = RunConfigurationProperties.getConfiguration(file) - val runConfigurations = try { + return try { + val projectHome = context.paths.projectHome + val file = RunConfigurationProperties.findRunConfiguration(projectHome, name) + val configuration = RunConfigurationProperties.getConfiguration(file) when (val type = RunConfigurationProperties.getConfigurationType(configuration)) { JUnitRunConfigurationProperties.TYPE -> { listOf(JUnitRunConfigurationProperties.loadRunConfiguration(file)) @@ -63,7 +63,6 @@ internal class TestingTasksImpl(private val context: CompilationContext, private context.messages.warning("##teamcity[buildProblem identity='$name' description='$description']") emptyList() } - return runConfigurations } override fun runTests(additionalJvmOptions: List, defaultMainModule: String?, rootExcludeCondition: ((Path) -> Boolean)?) {