commit 404830ea6cd5e7a8b64c79b795960243dbdcd350
author Johan Bay <jobay@google.com> Mon Dec 12 12:51:31 2022 +0100
committer Johan Bay <jobay@google.com> Mon Dec 12 14:10:46 2022 +0100
tree 425c308527350d72a6dbf6fa1146cd31c0bf47fa
parent f94514e1e2fd128f2a9e2c2f3b829258c241caae

Move regexp to field & rethrow throwables

native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt
index 834c157..c91b365 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt
@@ -12,6 +12,7 @@
 import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck.ExitCode
 import org.jetbrains.kotlin.konan.blackboxtest.support.runner.UnfilteredProcessOutput.Companion.launchReader
 import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter
+import org.junit.jupiter.api.Assertions.fail
 import java.io.ByteArrayOutputStream
 import kotlin.time.*
 
@@ -112,10 +113,12 @@
                             }
                         } catch (t: Throwable) {
                             if (t is Exception || t is AssertionError) {
-                                org.junit.jupiter.api.Assertions.fail<Nothing>(
+                                fail<Nothing>(
                                     getLoggedRun().withErrorMessage("Tested process output has not passed validation:\n\n" + t.message),
                                     t
                                 )
+                            } else {
+                                throw t
                             }
                         }
                     }

native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LldbSessionSpecification.kt

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LldbSessionSpecification.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LldbSessionSpecification.kt
index 18421d9..81564e5 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LldbSessionSpecification.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LldbSessionSpecification.kt
@@ -101,10 +101,11 @@
     companion object {
         val lldbOutputCommand = """(?=\(lldb\))""".toRegex()
         val wildcard = """\s*\[\.\.]\s*""".toRegex()
+        val separator = "(?=^>)".toRegex(RegexOption.MULTILINE)
 
         fun parse(spec: String): LldbSessionSpecification {
             val blocks = spec.trimIndent()
-                .split("(?=^>)".toRegex(RegexOption.MULTILINE))
+                .split(separator)
                 .filterNot(String::isEmpty)
             for (cmd in blocks) {
                 check(cmd.startsWith(">")) { "Invalid lldb session specification: $cmd" }