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

Fix running Swift tests on macOS >= 10.14.4. (#2836)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-04-01 12:43:10 +03:00
committed by GitHub
parent c1f4de7c29
commit 1baba6f054
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
+3 -1
View File
@@ -97,8 +97,10 @@ open class FrameworkTest : DefaultTask() {
val libraryPath = configs.absoluteTargetToolchain + "/usr/lib/swift/$swiftPlatform" val libraryPath = configs.absoluteTargetToolchain + "/usr/lib/swift/$swiftPlatform"
val executor = (project.convention.plugins["executor"] as? ExecutorService) val executor = (project.convention.plugins["executor"] as? ExecutorService)
?: throw RuntimeException("Executor wasn't found") ?: throw RuntimeException("Executor wasn't found")
// Hopefully, lexicographical comparison will work.
val newMacos = System.getProperty("os.version").compareTo("10.14.4") >= 0
val (stdOut, stdErr, exitCode) = runProcess( val (stdOut, stdErr, exitCode) = runProcess(
executor = executor.add(Action { it.environment = mapOf("DYLD_LIBRARY_PATH" to libraryPath) })::execute, executor = executor.add(Action { it.environment = if (newMacos) emptyMap() else mapOf("DYLD_LIBRARY_PATH" to libraryPath) })::execute,
executable = testExecutable.toString()) executable = testExecutable.toString())
println(""" println("""