Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Allow iOS unit tests to run on Xcode 13 #27850

Merged
merged 1 commit into from
Aug 2, 2021
Merged
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions testing/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,11 @@ def AssertExpectedJavaVersion():


def AssertExpectedXcodeVersion():
"""Checks that the user has a recent version of Xcode installed"""
EXPECTED_MAJOR_VERSION = ['11', '12']
"""Checks that the user has a version of Xcode installed"""
version_output = subprocess.check_output(['xcodebuild', '-version'])
match = re.match("Xcode (\d+)", version_output)
match = re.match(b"Xcode (\d+)", version_output)
message = "Xcode must be installed to run the iOS embedding unit tests"
assert match.group(1) in EXPECTED_MAJOR_VERSION, message
assert match, message


def RunJavaTests(filter, android_variant='android_debug_unopt'):
Expand Down