Skip to content

Commit 0f48d59

Browse files
committed
Tests: Adopt %target-cpu in a bunch of macCatalyst tests.
This makes the tests runnable on Apple Silicon Macs.
1 parent 2bb8b45 commit 0f48d59

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

test/ClangImporter/availability_maccatalyst.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -target x86_64-apple-ios13.1-macabi -typecheck -verify -I %S/Inputs/custom-modules %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -target %target-cpu-apple-ios13.1-macabi -typecheck -verify -I %S/Inputs/custom-modules %s
22

33
// REQUIRES: maccatalyst_support
44

test/ClangImporter/availability_maccatalyst_app_extension.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -target x86_64-apple-ios13.1-macabi -application-extension -typecheck -verify -I %S/Inputs/custom-modules %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -target %target-cpu-apple-ios13.1-macabi -application-extension -typecheck -verify -I %S/Inputs/custom-modules %s
22

33
// REQUIRES: maccatalyst_support
44

test/Serialization/runtime-import-from-sdk-maccatalyst.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,36 +77,36 @@ Swift.success()
7777
// over sdk/iOSSupport. (default resource dir + bad-bad-sdk)
7878
//
7979
// RUN: %empty-directory(%t.mcp)
80-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-bad-sdk) -target x86_64-apple-ios13.1-macabi -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=RESDIR-MACCATALYST
80+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-bad-sdk) -target %target-cpu-apple-ios13.1-macabi -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=RESDIR-MACCATALYST
8181
// RESDIR-MACCATALYST: success
8282

8383
// IOSSUP: If resource-dir has no standard library but sdk/iOSSupport does, it
8484
// will be preferred over sdk. (empty-resdir + good-bad-sdk)
8585
//
8686
// RUN: %empty-directory(%t.mcp)
87-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/good-bad-sdk) -target x86_64-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSSUP-MACCATALYST
87+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/good-bad-sdk) -target %target-cpu-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSSUP-MACCATALYST
8888
// IOSSUP-MACCATALYST: success
8989

9090
// IOSBAD: Confirms that we don't use sdk/iOSSupport on non-macCatalyst, even if
9191
// present. (empty-resdir + bad-good-sdk)
9292
//
9393
// RUN: %empty-directory(%t.mcp)
94-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-good-sdk) -target x86_64-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSBAD-MACCATALYST
94+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-good-sdk) -target %target-cpu-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSBAD-MACCATALYST
9595
// IOSBAD-MACCATALYST: failure
9696

9797
// SDKTOP: If resource-dir and sdk/iOSSupport don't have standard libraries but
9898
// sdk does, it will be used as a last resort. (empty-resdir + empty-good-sdk)
9999
//
100100
// RUN: %empty-directory(%t.mcp)
101-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-good-sdk) -target x86_64-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=SDKTOP-MACCATALYST
101+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-good-sdk) -target %target-cpu-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=SDKTOP-MACCATALYST
102102
// SDKTOP-MACCATALYST: success
103103

104104
// NILLIB: If no standard libraries are available, stdlib loading fails.
105105
// (empty-resdir + empty-empty-sdk) This one has a different error message from
106106
// the others because there are no failure-failure-failure triples to find.
107107
//
108108
// RUN: %empty-directory(%t.mcp)
109-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-empty-sdk) -target x86_64-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=NILLIB-MACCATALYST
109+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-empty-sdk) -target %target-cpu-apple-ios13.1-macabi -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=NILLIB-MACCATALYST
110110
// NILLIB-MACCATALYST: unable to load standard library
111111

112112

@@ -121,34 +121,34 @@ Swift.success()
121121
// over sdk/iOSSupport. (default resource dir + bad-bad-sdk)
122122
//
123123
// RUN: %empty-directory(%t.mcp)
124-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-bad-sdk) -target x86_64-apple-macosx10.15 -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=RESDIR-MACOSX
124+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-bad-sdk) -target %target-cpu-apple-macosx10.15 -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=RESDIR-MACOSX
125125
// RESDIR-MACOSX: {{success|module 'Swift' was created for incompatible target}}
126126

127127
// IOSSUP: If resource-dir has no standard library but sdk/iOSSupport does, it
128128
// will be preferred over sdk. (empty-resdir + good-bad-sdk)
129129
//
130130
// RUN: %empty-directory(%t.mcp)
131-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/good-bad-sdk) -target x86_64-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSSUP-MACOSX
131+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/good-bad-sdk) -target %target-cpu-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSSUP-MACOSX
132132
// IOSSUP-MACOSX: failure
133133

134134
// IOSBAD: Confirms that we don't use sdk/iOSSupport on non-macCatalyst, even if
135135
// present. (empty-resdir + bad-good-sdk)
136136
//
137137
// RUN: %empty-directory(%t.mcp)
138-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-good-sdk) -target x86_64-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSBAD-MACOSX
138+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/bad-good-sdk) -target %target-cpu-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=IOSBAD-MACOSX
139139
// IOSBAD-MACOSX: {{success|module 'Swift' was created for incompatible target}}
140140

141141
// SDKTOP: If resource-dir and sdk/iOSSupport don't have standard libraries but
142142
// sdk does, it will be used as a last resort. (empty-resdir + empty-good-sdk)
143143
//
144144
// RUN: %empty-directory(%t.mcp)
145-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-good-sdk) -target x86_64-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=SDKTOP-MACOSX
145+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-good-sdk) -target %target-cpu-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=SDKTOP-MACOSX
146146
// SDKTOP-MACOSX: {{success|module 'Swift' was created for incompatible target}}
147147

148148
// NILLIB: If no standard libraries are available, stdlib loading fails.
149149
// (empty-resdir + empty-empty-sdk) This one has a different error message from
150150
// the others because there are no failure-failure-failure triples to find.
151151
//
152152
// RUN: %empty-directory(%t.mcp)
153-
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-empty-sdk) -target x86_64-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=NILLIB-MACOSX
153+
// RUN: not %target-swift-frontend(mock-sdk: -sdk %t/empty-empty-sdk) -target %target-cpu-apple-macosx10.15 -resource-dir %t/empty-resdir/usr/lib/swift -module-cache-path %t.mcp -typecheck %s 2>&1 | %FileCheck %s --check-prefix=NILLIB-MACOSX
154154
// NILLIB-MACOSX: unable to load standard library

0 commit comments

Comments
 (0)