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

[Gradle] Try to fix flaky testSyntheticProjectPodfilePostprocessin

Browse Source
This commit is contained in:
Artem Daugel-Dauge
2023-05-04 18:41:06 +02:00
committed by Space Team
parent 543ab6c390
commit 927db1bb56
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
+7 -4
View File
@@ -303,7 +303,7 @@ class CocoaPodsIT : BaseGradleIT() {
@Test @Test
fun testSyntheticProjectPodfilePostprocessing() { fun testSyntheticProjectPodfilePostprocessing() {
project.gradleBuildScript().apply { project.gradleBuildScript().apply {
appendToCocoapodsBlock("""pod("AWSMobileClient", version = "2.30.0")""") appendToCocoapodsBlock("""pod("ChatSDK", version = "5.2.1")""")
appendText(""" appendText("""
@@ -1839,8 +1839,13 @@ class CocoaPodsIT : BaseGradleIT() {
} }
if (shouldInstallLocalCocoapods) { if (shouldInstallLocalCocoapods) {
val installDir = cocoapodsInstallationRoot.absolutePath
println("Installing CocoaPods...") println("Installing CocoaPods...")
gem("install", "--install-dir", cocoapodsInstallationRoot.absolutePath, "cocoapods", "-v", localCocoapodsVersion)
//https://github.com/ffi/ffi/issues/864#issuecomment-875242776
gem("install", "--install-dir", installDir, "ffi", "-v", "1.15.5", "--", "--enable-libffi-alloc")
gem("install", "--install-dir", installDir, "cocoapods", "-v", localCocoapodsVersion)
} else if (!isCocoapodsInstalled()) { } else if (!isCocoapodsInstalled()) {
fail( fail(
""" """
@@ -1894,8 +1899,6 @@ class CocoaPodsIT : BaseGradleIT() {
} }
private fun gem(vararg args: String): String { private fun gem(vararg args: String): String {
// On ARM MacOS, run gem using arch -x86_64 to workaround problems with libffi.
// https://stackoverflow.com/questions/64901180/running-cocoapods-on-apple-silicon-m1
val command = listOf("gem", *args) val command = listOf("gem", *args)
println("Run command: ${command.joinToString(separator = " ")}") println("Run command: ${command.joinToString(separator = " ")}")
val result = runProcess(command, File("."), options = BuildOptions(forceOutputToStdout = true)) val result = runProcess(command, File("."), options = BuildOptions(forceOutputToStdout = true))