Merge branch 'develop' into feature/xctest-parser

MarathonLabs · Oct 21, 2023 · b2b5686 · b2b5686
2 parents 62bbd63 + 3f3959e
commit b2b5686
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/TestRootFactory.kt b/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/TestRootFactory.kt
@@ -280,6 +280,9 @@ class TestRootFactory(private val device: AppleSimulatorDevice, private val vend
             if (supportedArchs.contains(Arch.x86_64) && device.arch != 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)) {
+                // Launch as plain x86_64 if test binary supports only x86_64
+                device.binaryEnvironment.lipo.removeArch(testRunnerBinary, Arch.arm64)
             }
         }
     }