[Test] Add IrTextDumpHandler and BytecodeListingHandler to IR BlackBox tests

This commit is contained in:
Dmitriy Novozhilov
2021-03-01 10:46:54 +03:00
committed by TeamCityServer
parent da0fd7cc15
commit c6f56b9809
3 changed files with 12 additions and 4 deletions
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.test.runners.codegen
import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.Constructor
import org.jetbrains.kotlin.test.TargetBackend 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.backend.ir.JvmIrBackendFacade
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING 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(::FirDumpHandler, ::FirScopeDumpHandler)
useFrontendHandlers(::FirCfgDumpHandler) useFrontendHandlers(::FirCfgDumpHandler)
useBackendHandlers(::IrTextDumpHandler) dumpHandlersForCodegenTest()
useArtifactsHandlers(::BytecodeListingHandler)
} }
} }
} }
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test.runners.codegen
import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.Constructor
import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade 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.ClassicFrontend2IrConverter
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact
@@ -25,4 +26,9 @@ open class AbstractIrBlackBoxCodegenTest : AbstractJvmBlackBoxCodegenTestBase<Cl
override val backendFacade: Constructor<BackendFacade<*, BinaryArtifacts.Jvm>> override val backendFacade: Constructor<BackendFacade<*, BinaryArtifacts.Jvm>>
get() = ::JvmIrBackendFacade get() = ::JvmIrBackendFacade
override fun configure(builder: TestConfigurationBuilder) {
super.configure(builder)
builder.dumpHandlersForCodegenTest()
}
} }
@@ -50,6 +50,11 @@ fun <R : ResultingArtifact.FrontendOutput<R>> TestConfigurationBuilder.commonCon
useBackendFacades(backendFacade) useBackendFacades(backendFacade)
} }
fun TestConfigurationBuilder.dumpHandlersForCodegenTest() {
useBackendHandlers(::IrTextDumpHandler)
useArtifactsHandlers(::BytecodeListingHandler)
}
fun TestConfigurationBuilder.commonHandlersForBoxTest() { fun TestConfigurationBuilder.commonHandlersForBoxTest() {
commonHandlersForCodegenTest() commonHandlersForCodegenTest()
useArtifactsHandlers( useArtifactsHandlers(