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

[K/N] Add binary option to produce error on mangled objc names (#5264)

Browse Source 
objcExportErrorOnNameCollisions=true binary option makes the compiler
emit an error whenever it mangles a name emitted by ObjCExport.

^KT-65863 Fixed
This commit is contained in:
Mark Mann
2024-02-16 18:17:30 +00:00
committed by Space Team
parent 0f8a416496
commit 00ef313df2
8 changed files with 129 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CompilerOutputTest.kt
+24 -8
View File
@@ -26,6 +26,7 @@ import org.junit.jupiter.api.Assumptions
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.Test
import java.io.File
import kotlin.test.assertIs
abstract class CompilerOutputTestBase : AbstractNativeSimpleTest() {
@Test
@@ -83,30 +84,45 @@ abstract class CompilerOutputTestBase : AbstractNativeSimpleTest() {
@Test
fun testObjCExportDiagnostics() {
val rootDir = File("native/native.tests/testData/compilerOutput/ObjCExportDiagnostics")
val compilationResult = doBuildObjCFrameworkWithNameCollisions(rootDir, listOf("-Xbinary=objcExportReportNameCollisions=true"))
val goldenData = rootDir.resolve("output.txt")
KotlinTestUtils.assertEqualsToFile(goldenData, compilationResult.toOutput())
}
@Test
fun testObjCExportDiagnosticsErrors() {
val rootDir = File("native/native.tests/testData/compilerOutput/ObjCExportDiagnostics")
val compilationResult = doBuildObjCFrameworkWithNameCollisions(rootDir, listOf("-Xbinary=objcExportErrorOnNameCollisions=true"))
assertIs<TestCompilationResult.Failure>(compilationResult)
val goldenData = rootDir.resolve("error.txt")
KotlinTestUtils.assertEqualsToFile(goldenData, compilationResult.toOutput())
}
private fun doBuildObjCFrameworkWithNameCollisions(rootDir: File, additionalOptions: List<String>): TestCompilationResult<out TestCompilationArtifact.ObjCFramework> {
Assumptions.assumeTrue(targets.hostTarget.family.isAppleFamily)
val rootDir = File("native/native.tests/testData/compilerOutput/ObjCExportDiagnostics")
val settings = testRunSettings
val lib1 = compileLibrary(settings, rootDir.resolve("lib1.kt")).assertSuccess().resultingArtifact
val lib2 = compileLibrary(settings, rootDir.resolve("lib2.kt")).assertSuccess().resultingArtifact
val freeCompilerArgs = TestCompilerArgs(
"-Xinclude=${lib1.path}",
"-Xinclude=${lib2.path}",
"-Xbinary=objcExportReportNameCollisions=true"
listOf(
"-Xinclude=${lib1.path}",
"-Xinclude=${lib2.path}"
) + additionalOptions
)
val expectedArtifact = TestCompilationArtifact.ObjCFramework(buildDir, "testObjCExportDiagnostics")
val compilationResult = ObjCFrameworkCompilation(
return ObjCFrameworkCompilation(
settings,
freeCompilerArgs,
sourceModules = emptyList(),
dependencies = emptyList(),
expectedArtifact
).result
val goldenData = rootDir.resolve("output.txt")
KotlinTestUtils.assertEqualsToFile(goldenData, compilationResult.toOutput())
}
internal fun compileLibrary(