From 447c0fb618bd9ae5fbd0ea0767b72839d00a5c11 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Wed, 17 Jan 2024 21:53:37 +0100 Subject: [PATCH] [K/N][Tests] Migrate kt56048 test ^KT-61259 --- .../backend.native/tests/build.gradle | 13 ------------ .../tests/interop/objc/kt50648/main.kt | 5 ----- .../tests/interop/objc/kt50648/objclib.def | 6 ------ .../testData/standalone/kt56048.kt | 21 +++++++++++++++++++ .../FirNativeStandaloneTestGenerated.java | 6 ++++++ .../NativeStandaloneTestGenerated.java | 6 ++++++ 6 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 kotlin-native/backend.native/tests/interop/objc/kt50648/main.kt delete mode 100644 kotlin-native/backend.native/tests/interop/objc/kt50648/objclib.def create mode 100644 native/native.tests/testData/standalone/kt56048.kt diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index b53a031a331..82150c0b81b 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -1180,9 +1180,6 @@ if (PlatformInfo.isAppleTarget(project)) { it.defFile 'interop/objc/kt48816/objclib.def' it.headers "$projectDir/interop/objc/kt48816/objclib.h" } - createInterop("objc_kt50648") { - it.defFile 'interop/objc/kt50648/objclib.def' - } createInterop("objc_kt55938") { it.defFile 'interop/objc/kt55938/objclib.def' it.headers "$projectDir/interop/objc/kt55938/objclib.h" @@ -1668,16 +1665,6 @@ if (PlatformInfo.isAppleTarget(project)) { flags = ["-Xlazy-ir-for-caches=enable"] } - interopTest("interop_objc_kt50648") { - source = 'interop/objc/kt50648/main.kt' - interop = "objc_kt50648" - expectedExitStatusChecker = { it != 0 } - outputChecker = { - it.contains("Converting Obj-C blocks with non-reference-typed return value to kotlin.Any is not supported (v)") && - (it.contains("kfun:#main(){}") || project.globalTestArgs.contains('-opt')) // Stacktrace. - } - } - interopTest("interop_objc_kt55938") { source = "interop/objc/kt55938/main.kt" lib = "interop/objc/kt55938/lib.kt" diff --git a/kotlin-native/backend.native/tests/interop/objc/kt50648/main.kt b/kotlin-native/backend.native/tests/interop/objc/kt50648/main.kt deleted file mode 100644 index 10667664aeb..00000000000 --- a/kotlin-native/backend.native/tests/interop/objc/kt50648/main.kt +++ /dev/null @@ -1,5 +0,0 @@ -import objclib.* - -fun main() { - getVoidBlockAsId() -} diff --git a/kotlin-native/backend.native/tests/interop/objc/kt50648/objclib.def b/kotlin-native/backend.native/tests/interop/objc/kt50648/objclib.def deleted file mode 100644 index cf0f0555b60..00000000000 --- a/kotlin-native/backend.native/tests/interop/objc/kt50648/objclib.def +++ /dev/null @@ -1,6 +0,0 @@ -language = Objective-C ---- -id getVoidBlockAsId() { - void (^result)(void) = ^{}; - return result; -} diff --git a/native/native.tests/testData/standalone/kt56048.kt b/native/native.tests/testData/standalone/kt56048.kt new file mode 100644 index 00000000000..b79d05e5257 --- /dev/null +++ b/native/native.tests/testData/standalone/kt56048.kt @@ -0,0 +1,21 @@ +// TARGET_BACKEND: NATIVE +// EXIT_CODE: !0 +// OUTPUT_REGEX: .*Converting Obj-C blocks with non-reference-typed return value to kotlin.Any is not supported \(v\).*kfun:#main.* + +// MODULE: cinterop +// FILE: objclib.def +language = Objective-C +--- +id getVoidBlockAsId() { + void (^result)(void) = ^{}; + return result; +} + +// MODULE: main(cinterop) +// FILE: main.kt +@file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class) +import objclib.* + +fun main() { + getVoidBlockAsId() +} diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeStandaloneTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeStandaloneTestGenerated.java index 31baaff86d7..7f1884f56e1 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeStandaloneTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeStandaloneTestGenerated.java @@ -34,6 +34,12 @@ public class FirNativeStandaloneTestGenerated extends AbstractNativeBlackBoxTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/standalone"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @Test + @TestMetadata("kt56048.kt") + public void testKt56048() throws Exception { + runTest("native/native.tests/testData/standalone/kt56048.kt"); + } + @Nested @TestMetadata("native/native.tests/testData/standalone/console") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeStandaloneTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeStandaloneTestGenerated.java index 2923314d0db..1711d20fb5f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeStandaloneTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeStandaloneTestGenerated.java @@ -31,6 +31,12 @@ public class NativeStandaloneTestGenerated extends AbstractNativeBlackBoxTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/standalone"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @Test + @TestMetadata("kt56048.kt") + public void testKt56048() throws Exception { + runTest("native/native.tests/testData/standalone/kt56048.kt"); + } + @Nested @TestMetadata("native/native.tests/testData/standalone/console") @TestDataPath("$PROJECT_ROOT")