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

Fix 'bitcode-build-tool' execution in tests

Browse Source 
Run it with python3 explicitly.
This commit is contained in:
SvyatoslavScherbina
2020-04-13 19:10:09 +03:00
committed by GitHub
parent cd6840a817
commit b638c90100
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
+4 -3
View File
@@ -200,7 +200,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
val testTarget = project.testTarget val testTarget = project.testTarget
val configurables = project.platformManager.platform(testTarget).configurables as AppleConfigurables 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 toolPath = "${configurables.absoluteTargetToolchain}/usr/bin/"
val sdk = when (testTarget) { val sdk = when (testTarget) {
KonanTarget.IOS_X64, KonanTarget.IOS_X64,
@@ -216,7 +216,8 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
else -> error("Cannot validate bitcode for test target $testTarget") else -> error("Cannot validate bitcode for test target $testTarget")
} }
runTest(executorService = localExecutorService(project), val python3 = Paths.get("/usr/bin/python3")
testExecutable = bitcodeBuildTool, args = listOf("--sdk", sdk, "-v", "-t", toolPath, frameworkBinary)) runTest(executorService = localExecutorService(project), testExecutable = python3,
args = listOf(bitcodeBuildTool, "--sdk", sdk, "-v", "-t", toolPath, frameworkBinary))
} }
} }