Skip to content

[Infra] Move --legacy flag into xcresulttool_json function #14736

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

Merged
merged 3 commits into from
Apr 17, 2025
Merged

[Infra] Move --legacy flag into xcresulttool_json function #14736

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd84b8e
[Infra] Move `--legacy` flag into `xcresulttool_json` function
andrewheard Apr 17, 2025
d43ad52
Touch `database.yml` to trigger integration test
andrewheard Apr 17, 2025
da8b9ed
Revert "Touch `database.yml` to trigger integration test"
andrewheard Apr 17, 2025
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
8 changes: 3 additions & 5 deletions scripts/xcresult_logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,7 @@ def export_log(xcresult_path, log_id):
Returns:
The logged output, as a string.
"""
# Note: --legacy is required for Xcode 16.
contents = xcresulttool_json(
'get', '--path', xcresult_path, '--id', log_id, '--legacy'
)
contents = xcresulttool_json('get', '--path', xcresult_path, '--id', log_id)

result = []
collect_log_output(contents, result)
Expand Down Expand Up @@ -284,7 +281,8 @@ def xcresulttool(*args):

def xcresulttool_json(*args):
"""Runs xcresulttool and its output as parsed JSON."""
args = list(args) + ['--format', 'json']
# Note: --legacy is required for Xcode 16.
args = list(args) + ['--format', 'json', '--legacy']
contents = xcresulttool(*args)
return json.loads(contents)

Expand Down
Loading