From f493df42a97622590693f26f0bb728cadda1b949 Mon Sep 17 00:00:00 2001 From: Artem Olkov Date: Tue, 27 Feb 2024 08:15:12 +0000 Subject: [PATCH] [Swift Export] fix swift export full test by adding missing runtime modulemap Merge-request: KT-MR-14627 Merged-by: Artem Olkov --- .../konan/test/blackbox/AbstractNativeSwiftExportTest.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSwiftExportTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSwiftExportTest.kt index a291b509278..8db050cc7ad 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSwiftExportTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSwiftExportTest.kt @@ -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(