Skip to content

Update iOSPlatform to mask platform_model with mapping. #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkAndersonIX wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update iOSPlatform to mask platform_model with mapping. #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarking/platforms/ios/ios_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def getIOSPlatforms(self, tempdir, usb_controller):
"abi": self.devices[device]["abi"],
}
platform = IOSPlatform(tempdir, idb, self.args, platform_meta)
platform.setPlatform(self.devices[device]["model"])
# platform.setPlatform(self.devices[device]["platform"])
platforms.append(platform)

return platforms
10 changes: 8 additions & 2 deletions benchmarking/platforms/ios/ios_platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import json
import os
import re
import shlex
import time

Expand All @@ -31,10 +32,15 @@ def __init__(self, tempdir, idb, args, platform_meta, usb_controller=None):
args.hash_platform_mapping,
args.device_name_mapping,
)
self.setPlatformHash(idb.device)
if self.platform:
self.platform_model = (
re.findall(r"(.*)-[0-9.]+", self.platform) or [self.platform]
)[0]
else:
self.platform_model = platform_meta.get("model")
self.platform_os_version = platform_meta.get("os_version")
self.platform_model = platform_meta.get("model")
self.platform_abi = platform_meta.get("abi")
self.setPlatformHash(idb.device)
self.usb_controller = usb_controller
self.type = "ios"
self.app = None
Expand Down