Merge pull request #952 from MarathonLabs/fix/apple-archs

fix(apple): safer removal of archs for binaries
MarathonLabs · Jun 28, 2024 · 62f4111 · 62f4111
2 parents d96af3b + 10c5479
commit 62f4111
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...ndor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/xctestrun/TestRootFactory.kt b/...ndor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/xctestrun/TestRootFactory.kt
@@ -439,10 +439,11 @@ class TestRootFactory(
             }
         } else if (device.sdk == Sdk.IPHONESIMULATOR) {
             val supportedArchs = device.binaryEnvironment.lipo.getArch(testBinary)
-            if (supportedArchs.contains(Arch.x86_64) && device.arch != Arch.arm64) {
+            val testRunnerArchs = device.binaryEnvironment.lipo.getArch(testRunnerBinary)
+            if (supportedArchs.contains(Arch.x86_64) && device.arch != Arch.arm64 && testRunnerArchs.contains(Arch.arm64)) {
                 // Launch as plain x86_64 if test binary has been built for simulator and is targeting x86_64
                 device.binaryEnvironment.lipo.removeArch(testRunnerBinary, Arch.arm64)
-            } else if (supportedArchs.contains(Arch.x86_64) && !supportedArchs.contains(Arch.arm64)) {
+            } else if (supportedArchs.contains(Arch.x86_64) && !supportedArchs.contains(Arch.arm64) && testRunnerArchs.contains(Arch.arm64)) {
                 // Launch as plain x86_64 if test binary supports only x86_64
                 device.binaryEnvironment.lipo.removeArch(testRunnerBinary, Arch.arm64)
             }