Skip to content

Commit ecc1a2d

Browse files
committed
Tests: Drop maccatalyst_support requirement for several tests.
As much as possible, we should avoid using `REQUIRES: maccatalyst_support` since tests restricted this way are not run in PR tests. Many tests that exercise macCatalyst behaviors can be run in a macOS configuration, without full macCatalyst standard library support. Also, adopt `%target-cpu` lit substitution where appropriate to avoid needless standard library module rebuilds when running tests locally.
1 parent fa0f2b2 commit ecc1a2d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

test/Parse/ConditionalCompilation/macabiTargetEnv.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// RUN: %swift -swift-version 4 -typecheck %s -verify -target x86_64-apple-ios12.0-macabi -parse-stdlib
2-
// RUN: %swift-ide-test -swift-version 4 -test-input-complete -source-filename=%s -target x86_64-apple-ios12.0-macabi
1+
// RUN: %swift -swift-version 4 -typecheck %s -verify -target %target-cpu-apple-ios12.0-macabi -parse-stdlib
2+
// RUN: %swift-ide-test -swift-version 4 -test-input-complete -source-filename=%s -target %target-cpu-apple-ios12.0-macabi
33

4-
// REQUIRES: maccatalyst_support
4+
// REQUIRES: OS=macosx || OS=maccatalyst
55

66
#if targetEnvironment(macabi) // expected-warning {{'macabi' has been renamed to 'macCatalyst'}} {{23-29=macCatalyst}}
77
func underMacABI() {

test/Sema/availability_refinement_contexts_target_min_inlining_maccatalyst.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -target %target-cpu-apple-ios14.4-macabi -typecheck -dump-type-refinement-contexts -target-min-inlining-version min %s > %t.dump 2>&1
77
// RUN: %FileCheck --strict-whitespace %s < %t.dump
88

9-
// REQUIRES: maccatalyst_support
9+
// REQUIRES: OS=macosx || OS=maccatalyst
1010

1111
// Verify that -target-min-inlining-version min implies 13.1 on macCatalyst.
1212

test/SourceKit/DocSupport/doc_swift_module_availability_maccatalyst_is_deprecated.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REQUIRES: maccatalyst_support
22

33
// RUN: %empty-directory(%t.mod)
4-
// RUN: %swift -emit-module -target x86_64-apple-ios13.1-macabi -o %t.mod/availability.swiftmodule %s -parse-as-library -emit-module-doc-path %t.mod/availability.swiftdoc
5-
// RUN: %sourcekitd-test -req=doc-info -module availability -- -target x86_64-apple-ios13.1-macabi -I %t.mod | %FileCheck %s
4+
// RUN: %swift -emit-module -target %target-cpu-apple-ios13.1-macabi -o %t.mod/availability.swiftmodule %s -parse-as-library -emit-module-doc-path %t.mod/availability.swiftdoc
5+
// RUN: %sourcekitd-test -req=doc-info -module availability -- -target %target-cpu-apple-ios13.1-macabi -I %t.mod | %FileCheck %s
66

77
@available(macCatalyst, deprecated: 20.0)
88
public func deprecatedInFutureVersion_catalyst() {}

test/attr/attr_availability_maccatalyst.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %swift -typecheck -verify -parse-stdlib -target x86_64-apple-ios51.0-macabi %s
1+
// RUN: %swift -typecheck -verify -parse-stdlib -target %target-cpu-apple-ios51.0-macabi %s
22

3-
// REQUIRES: maccatalyst_support
3+
// REQUIRES: OS=macosx || OS=maccatalyst
44

55
@available(macCatalyst, introduced: 1.0, deprecated: 2.0, obsoleted: 9.0,
66
message: "you don't want to do that anyway")

0 commit comments

Comments
 (0)