From b026de768d2d0ef4d945f6dbc4b217bd3323cc7d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 24 Feb 2021 19:59:02 +0100 Subject: [PATCH] Do not ever run JVM test handlers after previous errors If there's a frontend error in a test, or bytecode generation crashed with an exception, it makes no sense to run JVM test handlers such as lambda inlining checker or D8 checker. --- .../kotlin/test/backend/handlers/BinaryArtifactHandlers.kt | 3 +-- .../jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt | 2 +- .../org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BinaryArtifactHandlers.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BinaryArtifactHandlers.kt index 24a858d9f82..58f81b06773 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BinaryArtifactHandlers.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BinaryArtifactHandlers.kt @@ -13,12 +13,11 @@ import org.jetbrains.kotlin.test.services.TestServices abstract class JvmBinaryArtifactHandler( testServices: TestServices, failureDisablesNextSteps: Boolean = false, - doNotRunIfThereWerePreviousFailures: Boolean = false ) : BinaryArtifactHandler( testServices, ArtifactKinds.Jvm, failureDisablesNextSteps, - doNotRunIfThereWerePreviousFailures + doNotRunIfThereWerePreviousFailures = true, ) abstract class JsBinaryArtifactHandler( diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt index 5d702a732e4..e1e28b40d16 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.test.model.BinaryArtifacts import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices -class DxCheckerHandler(testServices: TestServices) : JvmBinaryArtifactHandler(testServices, doNotRunIfThereWerePreviousFailures = true) { +class DxCheckerHandler(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) { override val directivesContainers: List get() = listOf(CodegenTestDirectives) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt index 52c5f61c4fd..bcedcf112a7 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt @@ -28,7 +28,7 @@ import java.lang.reflect.Method import java.net.URL import java.net.URLClassLoader -class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(testServices, doNotRunIfThereWerePreviousFailures = true) { +class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) { companion object { private val BOX_IN_SEPARATE_PROCESS_PORT = System.getProperty("kotlin.test.box.in.separate.process.port") }