Skip to content

Commit 20b155a

Browse files
authored
Merge pull request #33104 from apple/shahmishal/execute-tests-on-supported-platforms
Only execute test for supported simulator plaforms
2 parents a30cf9c + 40ee9e5 commit 20b155a

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

test/Constraints/trailing_closures_objc.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// RUN: %target-typecheck-verify-swift
22

3+
// REQUIRES: rdar66110025
34
// REQUIRES: objc_interop
45
// REQUIRES: OS=macosx
56

utils/swift_build_support/swift_build_support/host_specific_configuration.py

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(self, host_target, args):
5454
platforms_to_skip_build = self.__platforms_to_skip_build(args)
5555
platforms_to_skip_test = self.__platforms_to_skip_test(args)
5656
platforms_archs_to_skip_test = \
57-
self.__platforms_archs_to_skip_test(args)
57+
self.__platforms_archs_to_skip_test(args, host_target)
5858
platforms_to_skip_test_host = self.__platforms_to_skip_test_host(args)
5959

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

255255
return platforms_to_skip_test
256256

257-
def __platforms_archs_to_skip_test(self, args):
257+
def __platforms_archs_to_skip_test(self, args, host_target):
258258
platforms_archs_to_skip_test = set()
259259
if not args.test_ios_32bit_simulator:
260260
platforms_archs_to_skip_test.add(
261261
StdlibDeploymentTarget.iOSSimulator.i386)
262+
if host_target == StdlibDeploymentTarget.OSX.x86_64.name:
263+
platforms_archs_to_skip_test.add(
264+
StdlibDeploymentTarget.iOSSimulator.arm64)
265+
platforms_archs_to_skip_test.add(
266+
StdlibDeploymentTarget.AppleTVSimulator.arm64)
267+
platforms_archs_to_skip_test.add(
268+
StdlibDeploymentTarget.AppleWatchSimulator.arm64)
269+
if host_target == StdlibDeploymentTarget.OSX.arm64.name:
270+
platforms_archs_to_skip_test.add(
271+
StdlibDeploymentTarget.iOSSimulator.i386)
272+
platforms_archs_to_skip_test.add(
273+
StdlibDeploymentTarget.iOSSimulator.x86_64)
274+
platforms_archs_to_skip_test.add(
275+
StdlibDeploymentTarget.AppleTVSimulator.x86_64)
276+
platforms_archs_to_skip_test.add(
277+
StdlibDeploymentTarget.AppleWatchSimulator.i386)
278+
262279
return platforms_archs_to_skip_test
263280

264281
def __platforms_to_skip_test_host(self, args):

validation-test/Sema/SwiftUI/rdar57201781.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RUN: %target-typecheck-verify-swift -target x86_64-apple-macosx10.15 -swift-version 5
2+
// REQUIRES: rdar66110075
23
// REQUIRES: objc_interop
34
// REQUIRES: OS=macosx
45

0 commit comments

Comments
 (0)