Cleanup interop tests for Apple targets: unify it with appropriate createInterop { }

This commit is contained in:
Pavel Punegov
2020-02-17 15:42:43 +03:00
committed by Pavel Punegov
parent 943fcab720
commit f68a0bfd69
+9 -13
View File
@@ -3560,8 +3560,8 @@ standaloneTest("interop_opengl_teapot") {
} }
*/ */
interopTest("interop_objc_smoke") { if (PlatformInfo.isAppleTarget(project)) {
disabled = !isAppleTarget(project) interopTest("interop_objc_smoke") {
goldValue = "84\nFoo\nDeallocated\n" + goldValue = "84\nFoo\nDeallocated\n" +
"Hello, World!\nKotlin says: Hello, everybody!\nHello from Kotlin\n2, 1\n" + "Hello, World!\nKotlin says: Hello, everybody!\nHello from Kotlin\n2, 1\n" +
"true\ntrue\n" + "true\ntrue\n" +
@@ -3596,12 +3596,10 @@ interopTest("interop_objc_smoke") {
into("$testOutputLocal/$name/$target/en.lproj/") into("$testOutputLocal/$name/$target/en.lproj/")
} }
} }
} }
interopTest("interop_objc_global_initializer") { interopTest("interop_objc_global_initializer") {
disabled = !isAppleTarget(project)
goldValue = "OK\n" goldValue = "OK\n"
source = "interop/objc_with_initializer/objc_test.kt" source = "interop/objc_with_initializer/objc_test.kt"
interop = 'objcMisc' interop = 'objcMisc'
flags = ['-g'] flags = ['-g']
@@ -3616,11 +3614,9 @@ interopTest("interop_objc_global_initializer") {
UtilsKt.codesign(project, "$buildDir/libobjcmisc.dylib") UtilsKt.codesign(project, "$buildDir/libobjcmisc.dylib")
} }
} }
} }
interopTest("interop_objc_msg_send") {
disabled = !isAppleTarget(project)
interopTest("interop_objc_msg_send") {
source = "interop/objc/msg_send/main.kt" source = "interop/objc/msg_send/main.kt"
interop = 'objcMessaging' interop = 'objcMessaging'
@@ -3634,13 +3630,13 @@ interopTest("interop_objc_msg_send") {
UtilsKt.codesign(project, "$buildDir/libobjcmessaging.dylib") UtilsKt.codesign(project, "$buildDir/libobjcmessaging.dylib")
} }
} }
} }
interopTest("interop_objc_kt34467") { interopTest("interop_objc_kt34467") {
disabled = !isAppleTarget(project)
source = "interop/objc/kt34467/foo.kt" source = "interop/objc/kt34467/foo.kt"
interop = 'objcKt34467' interop = 'objcKt34467'
goldValue = "OK\n42\n" goldValue = "OK\n42\n"
}
} }
standaloneTest("jsinterop_math") { standaloneTest("jsinterop_math") {