Skip to content

Only execute test for supported simulator plaforms #33104

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 2 commits into from
Jul 29, 2020
Merged

Only execute test for supported simulator plaforms #33104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed1c76d
Only execute test for supported simulator plaforms
shahmishal Jul 23, 2020
40ee9e5
[XFAIL] Sema/SwiftUI/rdar57201781.swift and Constraints/trailing_clos…
shahmishal Jul 25, 2020
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
1 change: 1 addition & 0 deletions test/Constraints/trailing_closures_objc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// RUN: %target-typecheck-verify-swift

// REQUIRES: rdar66110025
// REQUIRES: objc_interop
// REQUIRES: OS=macosx

Expand Down
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
1 change: 1 addition & 0 deletions validation-test/Sema/SwiftUI/rdar57201781.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: %target-typecheck-verify-swift -target x86_64-apple-macosx10.15 -swift-version 5
// REQUIRES: rdar66110075
// REQUIRES: objc_interop
// REQUIRES: OS=macosx

Expand Down