[K/N][Tests] Migrate two more cinterop tests

^KT-61259
This commit is contained in:
Vladimir Sukharev
2024-01-16 20:30:05 +01:00
committed by Space Team
parent 1e7e42baf2
commit 48df87f635
15 changed files with 96 additions and 69 deletions
@@ -1023,14 +1023,6 @@ createInterop("sockets") {
it.defFile 'interop/basics/sockets.def'
}
createInterop("concurrentTerminate") {
it.defFile 'interop/concurrentTerminate/concurrentTerminate.def'
it.headers "$projectDir/interop/concurrentTerminate/async.h"
// TODO: Using `-Xcompile-source` does not imply dependency on that source, so the task will no re-run when the source is updated.
it.extraOpts "-Xcompile-source", "$projectDir/interop/concurrentTerminate/async.cpp"
it.extraOpts "-Xsource-compiler-option", "-std=c++17"
}
createInterop("embedStaticLibraries") {
it.defFile 'interop/embedStaticLibraries/embedStaticLibraries.def'
it.headers "$projectDir/interop/embedStaticLibraries/embedStaticLibraries.h"
@@ -1055,10 +1047,6 @@ createInterop("embedStaticLibraries") {
it.extraOpts '-staticLibrary', "2.a"
}
createInterop("kt51925") {
it.defFile 'interop/kt51925/kt51925.def'
}
createInterop("kt43502") {
it.defFile 'interop/kt43502/kt43502.def'
it.headers "$projectDir/interop/kt43502/kt43502.h"
@@ -1328,13 +1316,6 @@ standaloneTest("interop_objc_allocException") {
UtilsKt.dependsOnPlatformLibs(it)
}
interopTest("interop_concurrentTerminate") {
source = "interop/concurrentTerminate/main.kt"
interop = 'concurrentTerminate'
outputChecker = { str -> str.endsWith("Reporting error!\n") }
expectedExitStatus = 99
}
interopTest("interop_embedStaticLibraries") {
source = "interop/embedStaticLibraries/main.kt"
interop = 'embedStaticLibraries'
@@ -1349,14 +1330,6 @@ interopTest("interop_withSpaces") {
}
}
// TODO: This test should be run with caches on.
interopTest("interop_kt51925") {
interop = 'kt51925'
lib = 'interop/kt51925/kt51925_lib.kt'
source = 'interop/kt51925/kt51925_main.kt'
useGoldenData = true
}
interopTestBase("interop_forwardDeclarationsCast", false, true) {
enabled = PlatformInfo.isAppleTarget(project)
interop = 'forwardDeclarationsCastA'
@@ -1,29 +0,0 @@
#include <thread>
#include <future>
#include <chrono>
#include <vector>
#include <csignal> // signal.h
#include "async.h"
int test_ConcurrentTerminate() {
signal(SIGABRT, *[](int){ exit(99); }); // Windows does not have sigaction
std::vector<std::future<void>> futures;
#ifdef __linux__
// TODO: invalid terminate handler called from bridge on non-main thread on Linux X64
throw std::runtime_error("Reporting error!");
#endif
for (size_t i = 0; i < 100; ++i) {
futures.emplace_back(std::async(std::launch::async,
[](size_t param) {
std::this_thread::sleep_for(std::chrono::milliseconds(param));
throw std::runtime_error("Reporting error!");
},
200 - i));
}
for (auto &future : futures) future.get();
return 0;
}
@@ -1,9 +0,0 @@
#ifdef __cplusplus
extern "C" {
#endif
int test_ConcurrentTerminate();
#ifdef __cplusplus
}
#endif
@@ -1,5 +0,0 @@
package async
---
int test_ConcurrentTerminate();
@@ -1,7 +0,0 @@
import async.*
import kotlinx.cinterop.*
fun main() {
test_ConcurrentTerminate()
println("This is not expected.")
}
@@ -1,9 +0,0 @@
strictEnums = E
---
enum E {
X = 1, Y = 2, Z = 42
};
typedef struct {
int d;
} Struct;
@@ -1,24 +0,0 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class)
import kt51925.*
import kotlinx.cinterop.*
fun bar1(e: E) = e.value
inline fun foo1() = bar1(E.Z)
fun bar2(s: Struct): Int {
return s.d
}
inline fun foo2(): Int {
memScoped {
val s = alloc<Struct>()
s.d = 42
return bar2(s)
}
}
@@ -1,9 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
fun main() {
println(foo1())
println(foo2())
}
@@ -1,2 +0,0 @@
42
42