From c6f56b980947237f5bcb71e1cf7d51e49a84538b Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 1 Mar 2021 10:46:54 +0300
Subject: [PATCH] [Test] Add IrTextDumpHandler and BytecodeListingHandler to IR
 BlackBox tests

---
 .../test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt  | 5 +----
 .../test/runners/codegen/AbstractIrBlackBoxCodegenTest.kt   | 6 ++++++
 .../kotlin/test/runners/codegen/BaseCodegenConfiguration.kt | 5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt
index d248484ff23..b011c4445b9 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.test.runners.codegen
 
 import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.TargetBackend
-import org.jetbrains.kotlin.test.backend.handlers.BytecodeListingHandler
-import org.jetbrains.kotlin.test.backend.handlers.IrTextDumpHandler
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING
@@ -42,8 +40,7 @@ open class AbstractFirBlackBoxCodegenTest : AbstractJvmBlackBoxCodegenTestBase<F
             }
             useFrontendHandlers(::FirDumpHandler, ::FirScopeDumpHandler)
             useFrontendHandlers(::FirCfgDumpHandler)
-            useBackendHandlers(::IrTextDumpHandler)
-            useArtifactsHandlers(::BytecodeListingHandler)
+            dumpHandlersForCodegenTest()
         }
     }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractIrBlackBoxCodegenTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractIrBlackBoxCodegenTest.kt
index 72b4df50de8..8c9b6a7fe68 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractIrBlackBoxCodegenTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractIrBlackBoxCodegenTest.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test.runners.codegen
 import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact
@@ -25,4 +26,9 @@ open class AbstractIrBlackBoxCodegenTest : AbstractJvmBlackBoxCodegenTestBase<Cl
 
     override val backendFacade: Constructor<BackendFacade<*, BinaryArtifacts.Jvm>>
         get() = ::JvmIrBackendFacade
+
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        builder.dumpHandlersForCodegenTest()
+    }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt
index b4d9945af35..bca27a6ca42 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt
@@ -50,6 +50,11 @@ fun <R : ResultingArtifact.FrontendOutput<R>> TestConfigurationBuilder.commonCon
     useBackendFacades(backendFacade)
 }
 
+fun TestConfigurationBuilder.dumpHandlersForCodegenTest() {
+    useBackendHandlers(::IrTextDumpHandler)
+    useArtifactsHandlers(::BytecodeListingHandler)
+}
+
 fun TestConfigurationBuilder.commonHandlersForBoxTest() {
     commonHandlersForCodegenTest()
     useArtifactsHandlers(