From 1baba6f054612e4c1799f0df57cb8246f60e4df8 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 1 Apr 2019 12:43:10 +0300 Subject: [PATCH] Fix running Swift tests on macOS >= 10.14.4. (#2836) --- .../src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt index 14e3b81551c..c74c8bf508d 100644 --- a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt +++ b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt @@ -97,8 +97,10 @@ open class FrameworkTest : DefaultTask() { val libraryPath = configs.absoluteTargetToolchain + "/usr/lib/swift/$swiftPlatform" val executor = (project.convention.plugins["executor"] as? ExecutorService) ?: 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( - 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()) println("""