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

[Native][Tests]Update executable location in AbstractNativeCExportTest

Browse Source 
Changed the code in AbstractNativeCExportTest to create the executable
in the same directory as the dynamic library.
This update is to accommodate the lack of rpath on Windows systems.
This commit is contained in:
Sergey Bogolepov
2023-12-09 22:10:54 +02:00
committed by Space Team
parent 8611851b2c
commit 85490f9201
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCExportTest.kt
+4 -1
View File
@@ -67,7 +67,10 @@ abstract class AbstractNativeCExportTest(
).result.assertSuccess().resultingArtifact
val clangExecutableName = "clangMain"
val executableFile = File(buildDir, clangExecutableName)
// We create executable in the same directory as dynamic library because there is no rpath on Windows.
// Possible alternative: generate executable in buildDir and move or copy DLL there.
// It might make sense in case of multiple dynamic libraries, but let's keep things simple for now.
val executableFile = File(binaryLibrary.libraryFile.parentFile, clangExecutableName)
val includeDirectories = binaryLibrary.headerFile?.let { listOf(it.parentFile) } ?: emptyList()
val libraryName = binaryLibrary.libraryFile.nameWithoutExtension.substringAfter("lib")
val clangResult = compileWithClang(