azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Make AbstractNativeCInteropTest a bit more flexible

Browse Source 
It probably requires a bit more thoughful refactoring, but before that
we need to collect more test-cases.
This commit is contained in:
Sergey Bogolepov
2023-01-12 13:16:28 +02:00
committed by Space Team
parent 72637f19dc
commit a9d13338bd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropTest.kt
+7 -1
View File
@@ -25,16 +25,22 @@ import java.io.File
abstract class AbstractNativeCInteropFModulesTest : AbstractNativeCInteropTest() { abstract class AbstractNativeCInteropFModulesTest : AbstractNativeCInteropTest() {
override val fmodules = true override val fmodules = true
override val defFileName: String = "pod1.def"
} }
abstract class AbstractNativeCInteropNoFModulesTest : AbstractNativeCInteropTest() { abstract class AbstractNativeCInteropNoFModulesTest : AbstractNativeCInteropTest() {
override val fmodules = false override val fmodules = false
override val defFileName: String = "pod1.def"
} }
@Tag("cinterop") @Tag("cinterop")
abstract class AbstractNativeCInteropTest : AbstractNativeCInteropBaseTest() { abstract class AbstractNativeCInteropTest : AbstractNativeCInteropBaseTest() {
abstract val fmodules: Boolean abstract val fmodules: Boolean
abstract val defFileName: String
@Synchronized @Synchronized
protected fun runTest(@TestDataFile testPath: String) { protected fun runTest(@TestDataFile testPath: String) {
// FIXME: check the following failures under Android with -fmodules // FIXME: check the following failures under Android with -fmodules
@@ -46,7 +52,7 @@ abstract class AbstractNativeCInteropTest : AbstractNativeCInteropBaseTest() {
val testPathFull = getAbsoluteFile(testPath) val testPathFull = getAbsoluteFile(testPath)
val testDataDir = testPathFull.parentFile.parentFile val testDataDir = testPathFull.parentFile.parentFile
val includeFolder = testDataDir.resolve("include") val includeFolder = testDataDir.resolve("include")
val defFile = testPathFull.resolve("pod1.def") val defFile = testPathFull.resolve(defFileName)
val defContents = defFile.readText().split("\n").map { it.trim() } val defContents = defFile.readText().split("\n").map { it.trim() }
val defHasObjC = defContents.any { it.endsWith("Objective-C") } val defHasObjC = defContents.any { it.endsWith("Objective-C") }
Assumptions.assumeFalse(defHasObjC && !targets.testTarget.family.isAppleFamily) Assumptions.assumeFalse(defHasObjC && !targets.testTarget.family.isAppleFamily)