[Native][tests] Fix for linux portability
The lldbReasonToAbort very MacOS specific, and only needed for dev
environment that are not properly configured. Better let the tests fail
in that case.
The patterns files for kt42208* contained MacOS specific constants, that
have now been Kleened away.
diff --git a/native/native.tests/testData/lldb/kt42208.pat b/native/native.tests/testData/lldb/kt42208.pat
index 626354d..9bb591b 100644
--- a/native/native.tests/testData/lldb/kt42208.pat
+++ b/native/native.tests/testData/lldb/kt42208.pat
@@ -1,7 +1,7 @@
> b ThrowException
> r
> bt
-* thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
+* thread #1, [..] stop reason = breakpoint 1.1
* frame #0: [..] program.kexe`ThrowException
frame #1: [..] program.kexe`kfun:main$lambda-0#internal at kt42208-2.kt:3:18
frame #2: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.invoke#internal(_this=[..]) at kt42208-1.kt:2:5
diff --git a/native/native.tests/testData/lldb/kt42208_with_passing_lambda_to_another_function.pat b/native/native.tests/testData/lldb/kt42208_with_passing_lambda_to_another_function.pat
index 4f9d719..d2225e3 100644
--- a/native/native.tests/testData/lldb/kt42208_with_passing_lambda_to_another_function.pat
+++ b/native/native.tests/testData/lldb/kt42208_with_passing_lambda_to_another_function.pat
@@ -1,7 +1,7 @@
> b kt42208-2.kt:5
> r
> bt
-* thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
+* thread #1, [..] stop reason = breakpoint 1.1
* frame #0: [..] program.kexe`kfun:main$lambda-0#internal at kt42208-2.kt:5:5
frame #1: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.invoke#internal(_this=[..]) at kt42208-1.kt:2:5
frame #2: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.$<bridge-BNN>invoke(_this=[..]){}kotlin.Boolean#internal at kt42208-1.kt:2:5
diff --git a/native/native.tests/testData/lldb/kt42208_with_variable.pat b/native/native.tests/testData/lldb/kt42208_with_variable.pat
index efa45b7..fb8d7a8 100644
--- a/native/native.tests/testData/lldb/kt42208_with_variable.pat
+++ b/native/native.tests/testData/lldb/kt42208_with_variable.pat
@@ -1,7 +1,7 @@
> b kt42208-2.kt:5
> r
> bt
- * thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
+ * thread #1, [..] stop reason = breakpoint 1.1
* frame #0: [..] program.kexe`kfun:main$lambda-0#internal at kt42208-2.kt:5:5
frame #1: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.invoke#internal(_this=[..]) at kt42208-1.kt:2:5
frame #2: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.$<bridge-BNN>invoke(_this=[..]){}kotlin.Boolean#internal at kt42208-1.kt:2:5
@@ -10,7 +10,7 @@
frame #5: [..]
> c
> bt
- * thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
+ * thread #1, [..] stop reason = breakpoint 1.1
* frame #0: [..] program.kexe`kfun:main$lambda-0#internal at kt42208-2.kt:5:5
frame #1: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.invoke#internal(_this=[..]) at kt42208-1.kt:2:5
frame #2: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.$<bridge-BNN>invoke(_this=[..]){}kotlin.Boolean#internal at kt42208-1.kt:2:5
@@ -18,7 +18,7 @@
frame #4: [..] program.kexe`Konan_start(args=[..]) at kt42208-1.kt:1:1
> c
> bt
- * thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
+ * thread #1, [..] stop reason = breakpoint 1.1
* frame #0: [..] program.kexe`kfun:main$lambda-0#internal at kt42208-2.kt:5:5
frame #1: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.invoke#internal(_this=[..]) at kt42208-1.kt:2:5
frame #2: [..] program.kexe`kfun:$main$lambda-0$FUNCTION_REFERENCE$0.$<bridge-BNN>invoke(_this=[..]){}kotlin.Boolean#internal at kt42208-1.kt:2:5
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/lldb/Matchers.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/lldb/Matchers.kt
index 23b5bad..258e50c 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/lldb/Matchers.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/lldb/Matchers.kt
@@ -57,11 +57,6 @@
* Current executable set to [..]program.kexe[..]
*/
fun lldbTest(@Language("kotlin") programText: String, lldbSession: String) {
- lldbReasonToAbort()?.let {
- println(it)
- return
- }
-
val lldbSessionSpec = LldbSessionSpecification.parse(lldbSession)
val tmpdir = Files.createTempDirectory("debugger_test")
@@ -76,21 +71,6 @@
lldbSessionSpec.match(result)
}
-fun lldbReasonToAbort() = when {
- !haveLldb ->
- "Skipping test: no LLDB"
- !targetIsHost() && !simulatorTestEnabled() ->
- "simulator tests disabled, check 'kotlin.native.test.debugger.simulator.enabled' property"
- !isOsxDevToolsEnabled ->
- """Development tools aren't available.
- |Please consider to execute:
- | ${DistProperties.devToolsSecurity} -enable
- |or
- | csrutil disable
- |to run lldb tests""".trimMargin()
- else -> null
-}
-
/**
* Another integration test for debug info.
*
@@ -100,11 +80,6 @@
* lines in the given source files.
*/
fun lldbCheckLineNumbers(src: Map<String, List<String>>, breakpoint: String, steps: Int) {
- lldbReasonToAbort()?.let {
- println(it)
- return
- }
-
val tmpdir = Files.createTempDirectory("debugger_test")
tmpdir.toFile().deleteOnExit()
