Merge pull request #55 from appium/master

Fork Sync: Update from parent repository
SonicCloudOrg · Jan 25, 2024 · 1ad9436 · 1ad9436
2 parents fdaba99 + 5d345d5
commit 1ad9436
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [5.15.8](https://github.com/appium/WebDriverAgent/compare/v5.15.7...v5.15.8) (2024-01-24)
+
+
+### Bug Fixes
+
+* use arm64 naming for xctestrun ([#840](https://github.com/appium/WebDriverAgent/issues/840)) ([429e154](https://github.com/appium/WebDriverAgent/commit/429e154c28ab2f17685723b02c941efce03984d4))
+
 ## [5.15.7](https://github.com/appium/WebDriverAgent/compare/v5.15.6...v5.15.7) (2024-01-16)
 
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -7,6 +7,7 @@ import { WDA_RUNNER_BUNDLE_ID, PLATFORM_NAME_TVOS } from './constants';
 import B from 'bluebird';
 import _fs from 'fs';
 import { waitForCondition } from 'asyncbox';
+import { arch } from 'os';
 
 const PROJECT_FILE = 'project.pbxproj';
 
@@ -168,9 +169,9 @@ async function setRealDeviceSecurity (keychainPath, keychainPassword) {
 /**
  * Creates xctestrun file per device & platform version.
  * We expects to have WebDriverAgentRunner_iphoneos${sdkVersion|platformVersion}-arm64.xctestrun for real device
- * and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}-x86_64.xctestrun for simulator located @bootstrapPath
+ * and WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}-${x86_64|arm64}.xctestrun for simulator located @bootstrapPath
  * Newer Xcode (Xcode 10.0 at least) generate xctestrun file following sdkVersion.
- * e.g. Xcode which has iOS SDK Version 12.2 generate WebDriverAgentRunner_iphonesimulator.2-x86_64.xctestrun
+ * e.g. Xcode which has iOS SDK Version 12.2 on an intel Mac host machine generates WebDriverAgentRunner_iphonesimulator.2-x86_64.xctestrun
  *      even if the cap has platform version 11.4
  *
  * @param {DeviceInfo} deviceInfo
@@ -260,9 +261,10 @@ async function getXctestrunFilePath (deviceInfo, sdkVersion, bootstrapPath) {
  * @return {string} returns xctestrunFilePath for given device
  */
 function getXctestrunFileName (deviceInfo, version) {
-  return isTvOS(deviceInfo.platformName)
-    ? `WebDriverAgentRunner_tvOS_appletv${deviceInfo.isRealDevice ? `os${version}-arm64` : `simulator${version}-x86_64`}.xctestrun`
-    : `WebDriverAgentRunner_iphone${deviceInfo.isRealDevice ? `os${version}-arm64` : `simulator${version}-x86_64`}.xctestrun`;
+  const archSuffix = deviceInfo.isRealDevice
+    ? `os${version}-arm64`
+    : `simulator${version}-${arch() === 'arm64' ? 'arm64' : 'x86_64'}`;
+  return `WebDriverAgentRunner_${isTvOS(deviceInfo.platformName) ? 'tvOS_appletv' : 'iphone'}${archSuffix}.xctestrun`;
 }
 
 /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "5.15.7",
+  "version": "5.15.8",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {