azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FullPipelineModularizedTest: code cleanup

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-01 21:51:49 +03:00
parent 9f27bc62c0
commit 0324c0d02f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
+3 -5
View File
@@ -193,8 +193,6 @@ class FullPipelineModularizedTest : AbstractModularizedTest() {
} }
} }
private fun Throwable.deepestCause(): Throwable = cause?.deepestCause() ?: this
override fun processModule(moduleData: ModuleData): ProcessorAction { override fun processModule(moduleData: ModuleData): ProcessorAction {
val compiler = K2JVMCompiler() val compiler = K2JVMCompiler()
val args = compiler.createArguments() val args = compiler.createArguments()
@@ -242,10 +240,10 @@ class FullPipelineModularizedTest : AbstractModularizedTest() {
} }
ExitCode.INTERNAL_ERROR -> { ExitCode.INTERNAL_ERROR -> {
crashedModules += moduleData crashedModules += moduleData
moduleData.exceptionMessage = collector.messages.firstOrNull() { moduleData.exceptionMessage = collector.messages.firstOrNull {
it.severity == CompilerMessageSeverity.EXCEPTION it.severity == CompilerMessageSeverity.EXCEPTION
}?.message?.split("\n")?.let { }?.message?.split("\n")?.let { exceptionLines ->
it.lastOrNull { it.startsWith("Caused by: ") } ?: it.firstOrNull() exceptionLines.lastOrNull { it.startsWith("Caused by: ") } ?: exceptionLines.firstOrNull()
} ?: "NO MESSAGE" } ?: "NO MESSAGE"
ProcessorAction.NEXT ProcessorAction.NEXT
} }