From 06923467155188ab9d6e57c8b44d8686a9250f73 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Thu, 21 Dec 2023 12:08:15 +0100 Subject: [PATCH] [K/N][tests] Fix new line handling in termination tests ^KT-61259 --- .../native.tests/testData/standalone/termination/globalThrow.kt | 2 +- .../native.tests/testData/standalone/termination/mainThrow.kt | 2 +- .../standalone/termination/processUnhandledException.kt | 2 +- .../standalone/termination/terminateWithUnhandledException.kt | 2 +- .../standalone/termination/unhandledExceptionHookClosure.kt | 2 +- .../standalone/termination/unhandledExceptionHookFun.kt | 2 +- .../standalone/termination/unhandledExceptionHookTerminate.kt | 2 +- .../termination/unhandledExceptionHookTerminateWithProcess.kt | 2 +- .../standalone/termination/unhandledExceptionHookThrow.kt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/native/native.tests/testData/standalone/termination/globalThrow.kt b/native/native.tests/testData/standalone/termination/globalThrow.kt index 8835c08832e..c30c3197696 100644 --- a/native/native.tests/testData/standalone/termination/globalThrow.kt +++ b/native/native.tests/testData/standalone/termination/globalThrow.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\n(?!.*FAIL.*).* +// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\R(?!.*FAIL.*).* val p: Nothing = throw Error("an error") diff --git a/native/native.tests/testData/standalone/termination/mainThrow.kt b/native/native.tests/testData/standalone/termination/mainThrow.kt index 515afdec5a8..dd40fa680e8 100644 --- a/native/native.tests/testData/standalone/termination/mainThrow.kt +++ b/native/native.tests/testData/standalone/termination/mainThrow.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\n.* +// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\R.* fun main() { throw Error("an error") diff --git a/native/native.tests/testData/standalone/termination/processUnhandledException.kt b/native/native.tests/testData/standalone/termination/processUnhandledException.kt index dbbadc07d69..5a235df60ac 100644 --- a/native/native.tests/testData/standalone/termination/processUnhandledException.kt +++ b/native/native.tests/testData/standalone/termination/processUnhandledException.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\n.* +// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\R.* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class) fun main() { diff --git a/native/native.tests/testData/standalone/termination/terminateWithUnhandledException.kt b/native/native.tests/testData/standalone/termination/terminateWithUnhandledException.kt index a5aaa7a4951..b228b439c00 100644 --- a/native/native.tests/testData/standalone/termination/terminateWithUnhandledException.kt +++ b/native/native.tests/testData/standalone/termination/terminateWithUnhandledException.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\n.* +// OUTPUT_REGEX: Uncaught Kotlin exception: kotlin\.Error: an error\R.* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class) fun main() { diff --git a/native/native.tests/testData/standalone/termination/unhandledExceptionHookClosure.kt b/native/native.tests/testData/standalone/termination/unhandledExceptionHookClosure.kt index b2163e02791..c1580fb215e 100644 --- a/native/native.tests/testData/standalone/termination/unhandledExceptionHookClosure.kt +++ b/native/native.tests/testData/standalone/termination/unhandledExceptionHookClosure.kt @@ -1,6 +1,6 @@ // EXIT_CODE: !0 // FREE_COMPILER_ARGS: -opt-in=kotlin.native.internal.InternalForKotlinNative -// OUTPUT_REGEX: value 42: Error\. Runnable state: true\nUncaught Kotlin exception: kotlin\.Error: an error\n.* +// OUTPUT_REGEX: value 42: Error\. Runnable state: true\RUncaught Kotlin exception: kotlin\.Error: an error\R.* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class, kotlin.native.runtime.NativeRuntimeApi::class) import kotlin.native.runtime.Debugging diff --git a/native/native.tests/testData/standalone/termination/unhandledExceptionHookFun.kt b/native/native.tests/testData/standalone/termination/unhandledExceptionHookFun.kt index e0b9eff8033..15aa97ef283 100644 --- a/native/native.tests/testData/standalone/termination/unhandledExceptionHookFun.kt +++ b/native/native.tests/testData/standalone/termination/unhandledExceptionHookFun.kt @@ -1,6 +1,6 @@ // EXIT_CODE: !0 // FREE_COMPILER_ARGS: -opt-in=kotlin.native.internal.InternalForKotlinNative -// OUTPUT_REGEX: value true: Error\. Runnable state: true\nUncaught Kotlin exception: kotlin\.Error: an error\n.* +// OUTPUT_REGEX: value true: Error\. Runnable state: true\RUncaught Kotlin exception: kotlin\.Error: an error\R.* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class, kotlin.native.runtime.NativeRuntimeApi::class) import kotlin.native.runtime.Debugging diff --git a/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminate.kt b/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminate.kt index 77cf1cfe519..7468d5b0c94 100644 --- a/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminate.kt +++ b/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminate.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Hook\nUncaught Kotlin exception: kotlin\.Error: an error\n.* +// OUTPUT_REGEX: Hook\RUncaught Kotlin exception: kotlin\.Error: an error\R.* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class) import kotlin.test.* diff --git a/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminateWithProcess.kt b/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminateWithProcess.kt index 0f466f20696..3a8b122a1c0 100644 --- a/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminateWithProcess.kt +++ b/native/native.tests/testData/standalone/termination/unhandledExceptionHookTerminateWithProcess.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Hook\nUncaught Kotlin exception: kotlin\.Error: an error\n(?!.*FAIL.*).* +// OUTPUT_REGEX: Hook\RUncaught Kotlin exception: kotlin\.Error: an error\R(?!.*FAIL.*).* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class) import kotlin.test.* diff --git a/native/native.tests/testData/standalone/termination/unhandledExceptionHookThrow.kt b/native/native.tests/testData/standalone/termination/unhandledExceptionHookThrow.kt index 5cd908b244d..7ca17bf1a11 100644 --- a/native/native.tests/testData/standalone/termination/unhandledExceptionHookThrow.kt +++ b/native/native.tests/testData/standalone/termination/unhandledExceptionHookThrow.kt @@ -1,5 +1,5 @@ // EXIT_CODE: !0 -// OUTPUT_REGEX: Hook\nUncaught Kotlin exception: kotlin\.Error: another error\n(?!.*an error.*).* +// OUTPUT_REGEX: Hook\RUncaught Kotlin exception: kotlin\.Error: another error\R(?!.*an error.*).* @file:OptIn(kotlin.experimental.ExperimentalNativeApi::class) import kotlin.test.*