Skip to content

Only execute test for supported simulator plaforms #33076

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
shahmishal merged 1 commit into from
Jul 24, 2020
Merged

Only execute test for supported simulator plaforms #33076

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
21 changes: 19 additions & 2 deletions utils/swift_build_support/swift_build_support/host_specific_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __init__(self, host_target, args):
platforms_to_skip_build = self.__platforms_to_skip_build(args)
platforms_to_skip_test = self.__platforms_to_skip_test(args)
platforms_archs_to_skip_test = \
self.__platforms_archs_to_skip_test(args)
self.__platforms_archs_to_skip_test(args, host_target)
platforms_to_skip_test_host = self.__platforms_to_skip_test_host(args)

# Compute the lists of **CMake** targets for each use case (configure
Expand Down Expand Up @@ -254,11 +254,28 @@ def __platforms_to_skip_test(self, args):

return platforms_to_skip_test

def __platforms_archs_to_skip_test(self, args):
def __platforms_archs_to_skip_test(self, args, host_target):
platforms_archs_to_skip_test = set()
if not args.test_ios_32bit_simulator:
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator.i386)
if host_target == StdlibDeploymentTarget.OSX.x86_64.name:
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator.arm64)
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.AppleTVSimulator.arm64)
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.AppleWatchSimulator.arm64)
if host_target == StdlibDeploymentTarget.OSX.arm64.name:
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator.i386)
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator.x86_64)
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.AppleTVSimulator.x86_64)
platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.AppleWatchSimulator.i386)

return platforms_archs_to_skip_test

def __platforms_to_skip_test_host(self, args):
Expand Down