Skip to content

Commit f493df4

Browse files
mMaxySpace Team
authored and
Space Team
committed
[Swift Export] fix swift export full test by adding missing runtime modulemap
Merge-request: KT-MR-14627 Merged-by: Artem Olkov <[email protected]>
1 parent 347eedb commit f493df4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSwiftExportTest.kt

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.jetbrains.kotlin.konan.test.blackbox
77

88
import com.intellij.testFramework.TestDataFile
9+
import org.jetbrains.kotlin.konan.target.Distribution
910
import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName
1011
import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase
1112
import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseId
@@ -29,6 +30,7 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.util.createTestProvider
2930
import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile
3031
import org.jetbrains.kotlin.swiftexport.standalone.*
3132
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
33+
import org.jetbrains.kotlin.utils.KotlinNativePaths
3234
import org.junit.jupiter.api.Assumptions
3335
import org.junit.jupiter.api.Tag
3436
import java.io.File
@@ -99,6 +101,7 @@ abstract class AbstractNativeSwiftExportTest() : AbstractNativeSimpleTest() {
99101
),
100102
swiftExtraOpts = listOf(
101103
"-Xcc", "-fmodule-map-file=${moduleMap.absolutePath}",
104+
"-Xcc", "-fmodule-map-file=${Distribution(KotlinNativePaths.homePath.absolutePath).kotlinRuntimeForSwiftModuleMap}",
102105
"-L", binaryLibrary.libraryFile.parentFile.absolutePath,
103106
"-l$binaryLibraryName",
104107
"-emit-module", "-parse-as-library", "-emit-library", "-enable-library-evolution",
@@ -120,6 +123,7 @@ abstract class AbstractNativeSwiftExportTest() : AbstractNativeSimpleTest() {
120123
"-L", swiftModuleDir.absolutePath,
121124
"-l$binaryLibraryName",
122125
"-Xcc", "-fmodule-map-file=${moduleMap.absolutePath}",
126+
"-Xcc", "-fmodule-map-file=${Distribution(KotlinNativePaths.homePath.absolutePath).kotlinRuntimeForSwiftModuleMap}",
123127
)
124128
val provider = createTestProvider(buildDir, testSources)
125129
val success = SwiftCompilation(

0 commit comments

Comments
 (0)