From b638c90100a8965e4b11b4d9ffbe6631a966da90 Mon Sep 17 00:00:00 2001 From: SvyatoslavScherbina Date: Mon, 13 Apr 2020 19:10:09 +0300 Subject: [PATCH] Fix 'bitcode-build-tool' execution in tests Run it with python3 explicitly. --- .../src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt index f06a012c1bd..9a65337eb1f 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt @@ -200,7 +200,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable { val testTarget = project.testTarget val configurables = project.platformManager.platform(testTarget).configurables as AppleConfigurables - val bitcodeBuildTool = Paths.get("${configurables.absoluteAdditionalToolsDir}/bin/bitcode-build-tool") + val bitcodeBuildTool = "${configurables.absoluteAdditionalToolsDir}/bin/bitcode-build-tool" val toolPath = "${configurables.absoluteTargetToolchain}/usr/bin/" val sdk = when (testTarget) { KonanTarget.IOS_X64, @@ -216,7 +216,8 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable { else -> error("Cannot validate bitcode for test target $testTarget") } - runTest(executorService = localExecutorService(project), - testExecutable = bitcodeBuildTool, args = listOf("--sdk", sdk, "-v", "-t", toolPath, frameworkBinary)) + val python3 = Paths.get("/usr/bin/python3") + runTest(executorService = localExecutorService(project), testExecutable = python3, + args = listOf(bitcodeBuildTool, "--sdk", sdk, "-v", "-t", toolPath, frameworkBinary)) } } \ No newline at end of file