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

[Swift Export] fix swift export full test by adding missing runtime modulemap

Browse Source 
Merge-request: KT-MR-14627
Merged-by: Artem Olkov <artem.olkov@jetbrains.com>
This commit is contained in:
Artem Olkov
2024-02-27 08:15:12 +00:00
committed by Space Team
parent 347eedb0a0
commit f493df42a9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSwiftExportTest.kt
+4
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.konan.test.blackbox
import com.intellij.testFramework.TestDataFile
import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName
import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase
import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseId
@@ -29,6 +30,7 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.util.createTestProvider
import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile
import org.jetbrains.kotlin.swiftexport.standalone.*
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
import org.jetbrains.kotlin.utils.KotlinNativePaths
import org.junit.jupiter.api.Assumptions
import org.junit.jupiter.api.Tag
import java.io.File
@@ -99,6 +101,7 @@ abstract class AbstractNativeSwiftExportTest() : AbstractNativeSimpleTest() {
),
swiftExtraOpts = listOf(
"-Xcc", "-fmodule-map-file=${moduleMap.absolutePath}",
"-Xcc", "-fmodule-map-file=${Distribution(KotlinNativePaths.homePath.absolutePath).kotlinRuntimeForSwiftModuleMap}",
"-L", binaryLibrary.libraryFile.parentFile.absolutePath,
"-l$binaryLibraryName",
"-emit-module", "-parse-as-library", "-emit-library", "-enable-library-evolution",
@@ -120,6 +123,7 @@ abstract class AbstractNativeSwiftExportTest() : AbstractNativeSimpleTest() {
"-L", swiftModuleDir.absolutePath,
"-l$binaryLibraryName",
"-Xcc", "-fmodule-map-file=${moduleMap.absolutePath}",
"-Xcc", "-fmodule-map-file=${Distribution(KotlinNativePaths.homePath.absolutePath).kotlinRuntimeForSwiftModuleMap}",
)
val provider = createTestProvider(buildDir, testSources)
val success = SwiftCompilation(