Skip to content

Commit 9dcea15

Browse files
nickolas-pohiletsnickolas-pohilets
committed
Fixed tests on Linux, Windows and older MacOS versions
1 parent f1e3002 commit 9dcea15

File tree

9 files changed

+67
-68
lines changed

9 files changed

+67
-68
lines changed

‎test/Concurrency/Runtime/actor_deinit_escaping_self.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library)
22

33
// REQUIRES: executable_test
4+
// REQUIRES: libdispatch
45
// REQUIRES: concurrency
56
// REQUIRES: concurrency_runtime
67
// UNSUPPORTED: back_deployment_runtime
@@ -31,6 +32,7 @@ actor EscapeLocked {
3132

3233
@main struct Main {
3334
static func main() async {
35+
// Ideally these tests should be compile-time errors
3436
let tests = TestSuite("EscapingSelf")
3537
tests.test("escape while locked") {
3638
_ = EscapeLocked()

‎test/Concurrency/Runtime/async_task_locals_isolated_deinit.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
// RUN: %target-run-simple-swift( -plugin-path %swift-plugin-dir -Xfrontend -disable-availability-checking -parse-stdlib %import-libdispatch)
22

3+
// REQUIRES: libdispatch
34
// REQUIRES: executable_test
45
// REQUIRES: concurrency
6+
// REQUIRES: concurrency_runtime
7+
// UNSUPPORTED: back_deployment_runtime
58

69
import Swift
710
import _Concurrency

‎test/Concurrency/deinit_isolation.swift

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -verify %s
2-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
1+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -verify %s
2+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
44

55
// REQUIRES: concurrency
66

@@ -22,7 +22,7 @@
2222
func isolatedFunc() {} // expected-note 11{{calls to global function 'isolatedFunc()' from outside of its actor context are implicitly asynchronous}}
2323

2424
// CHECK-LABEL: class BaseWithNonisolatedDeinit {
25-
// CHECK: @objc deinit
25+
// CHECK: {{(@objc )?}}deinit
2626
// CHECK: }
2727
// CHECK-SYMB-NOT: BaseWithNonisolatedDeinit.__isolated_deallocating_deinit
2828
// CHECK-SYMB-NOT: @$s16deinit_isolation25BaseWithNonisolatedDeinitCfZ
@@ -32,7 +32,7 @@ func isolatedFunc() {} // expected-note 11{{calls to global function 'isolatedF
3232
class BaseWithNonisolatedDeinit {}
3333

3434
// CHECK-LABEL: class BaseWithDeinitIsolatedOnFirstActor {
35-
// CHECK: @objc @FirstActor deinit
35+
// CHECK: {{(@objc )?}}@FirstActor deinit
3636
// CHECK: }
3737
// CHECK-SYMB: BaseWithDeinitIsolatedOnFirstActor.__isolated_deallocating_deinit
3838
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -45,7 +45,7 @@ class BaseWithDeinitIsolatedOnFirstActor {
4545
}
4646

4747
// CHECK-LABEL: class BaseWithDeinitIsolatedOnSecondActor {
48-
// CHECK: @objc @SecondActor deinit
48+
// CHECK: {{(@objc )?}}@SecondActor deinit
4949
// CHECK: }
5050
// CHECK-SYMB: BaseWithDeinitIsolatedOnSecondActor.__isolated_deallocating_deinit
5151
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: SecondActor
@@ -60,7 +60,7 @@ class BaseWithDeinitIsolatedOnSecondActor {
6060
// MARK: - Part 1 - Actors
6161

6262
// CHECK-LABEL: actor ImplicitDeinitActor {
63-
// CHECK: @objc nonisolated deinit
63+
// CHECK: {{(@objc )?}}nonisolated deinit
6464
// CHECK: }
6565
// CHECK-SYMB-NOT: ImplicitDeinitActor.__isolated_deallocating_deinit
6666
// CHECK-SYMB-NOT: @$s16deinit_isolation19ImplicitDeinitActorCfZ
@@ -72,7 +72,7 @@ actor ImplicitDeinitActor {
7272
}
7373

7474
// CHECK-LABEL: actor ExplicitDeinitActor {
75-
// CHECK: @objc deinit
75+
// CHECK: {{(@objc )?}}deinit
7676
// CHECK: }
7777
// CHECK-SYMB: // ExplicitDeinitActor.__isolated_deallocating_deinit
7878
// CHECK-SYMB-NEXT: // Isolation: actor_instance. name: 'self'
@@ -90,7 +90,7 @@ actor ExplicitDeinitActor {
9090
}
9191

9292
// CHECK-LABEL: actor NonisolatedDeinitActor {
93-
// CHECK: @objc nonisolated deinit
93+
// CHECK: {{(@objc )?}}nonisolated deinit
9494
// CHECK: }
9595
// CHECK-SYMB-NOT: NonisolatedDeinitActor.__isolated_deallocating_deinit
9696
// CHECK-SYMB-NOT: @$s16deinit_isolation22NonisolatedDeinitActorCfZ
@@ -107,7 +107,7 @@ actor NonisolatedDeinitActor {
107107
}
108108

109109
// CHECK-LABEL: actor IsolatedDeinitActor {
110-
// CHECK: @objc @FirstActor deinit
110+
// CHECK: {{(@objc )?}}@FirstActor deinit
111111
// CHECK: }
112112
// CHECK-SYMB: // IsolatedDeinitActor.__isolated_deallocating_deinit
113113
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -126,7 +126,7 @@ actor IsolatedDeinitActor {
126126
// MARK: - Part 2.1 - Without base class
127127

128128
// CHECK-LABEL: @FirstActor class ImplicitDeinit {
129-
// CHECK: @objc deinit
129+
// CHECK: {{(@objc )?}}deinit
130130
// CHECK: }
131131
// CHECK-SYMB-NOT: ImplicitDeinit.__isolated_deallocating_deinit
132132
// CHECK-SYMB-NOT: @$s16deinit_isolation14ImplicitDeinitCfZ
@@ -139,7 +139,7 @@ class ImplicitDeinit {
139139
}
140140

141141
// CHECK-LABEL: @FirstActor class ExplicitDeinit {
142-
// CHECK: @objc @FirstActor deinit
142+
// CHECK: {{(@objc )?}}@FirstActor deinit
143143
// CHECK: }
144144
// CHECK-SYMB: // ExplicitDeinit.__isolated_deallocating_deinit
145145
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -156,7 +156,7 @@ class ExplicitDeinit {
156156
}
157157

158158
// CHECK-LABEL: @FirstActor class NonisolatedDeinit {
159-
// CHECK: @objc nonisolated deinit
159+
// CHECK: {{(@objc )?}}nonisolated deinit
160160
// CHECK: }
161161
// CHECK-SYMB-NOT: NonisolatedDeinit.__isolated_deallocating_deinit
162162
// CHECK-SYMB-NOT: @$s16deinit_isolation17NonisolatedDeinitCfZ
@@ -174,7 +174,7 @@ class NonisolatedDeinit {
174174
}
175175

176176
// CHECK-LABEL: class IsolatedDeinit {
177-
// CHECK: @objc @FirstActor deinit
177+
// CHECK: {{(@objc )?}}@FirstActor deinit
178178
// CHECK: }
179179
// CHECK-SYMB: // IsolatedDeinit.__isolated_deallocating_deinit
180180
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -190,7 +190,7 @@ class IsolatedDeinit {
190190
}
191191

192192
// CHECK-LABEL: @FirstActor class DifferentIsolatedDeinit {
193-
// CHECK: @objc @SecondActor deinit
193+
// CHECK: {{(@objc )?}}@SecondActor deinit
194194
// CHECK: }
195195
// CHECK-SYMB: // DifferentIsolatedDeinit.__isolated_deallocating_deinit
196196
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: SecondActor
@@ -211,7 +211,7 @@ class DifferentIsolatedDeinit {
211211
// MARK: - Part 2.2 - Base class with nonisolated deinit
212212

213213
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ImplicitDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
214-
// CHECK: @objc deinit
214+
// CHECK: {{(@objc )?}}deinit
215215
// CHECK: }
216216
// CHECK-SYMB-NOT: ImplicitDeinitInheritNonisolated.__isolated_deallocating_deinit
217217
// CHECK-SYMB-NOT: @$s16deinit_isolation32ImplicitDeinitInheritNonisolatedCfZ
@@ -224,7 +224,7 @@ class ImplicitDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
224224
}
225225

226226
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ExplicitDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
227-
// CHECK: @objc @FirstActor deinit
227+
// CHECK: {{(@objc )?}}@FirstActor deinit
228228
// CHECK: }
229229
// CHECK-SYMB: // ExplicitDeinitInheritNonisolated.__isolated_deallocating_deinit
230230
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -241,7 +241,7 @@ class ExplicitDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
241241
}
242242

243243
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class NonisolatedDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
244-
// CHECK: @objc nonisolated deinit
244+
// CHECK: {{(@objc )?}}nonisolated deinit
245245
// CHECK: }
246246
// CHECK-SYMB-NOT: NonisolatedDeinitInheritNonisolated.__isolated_deallocating_deinit
247247
// CHECK-SYMB-NOT: @$s16deinit_isolation024NonisolatedDeinitInheritC0CfZ
@@ -259,7 +259,7 @@ class NonisolatedDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
259259
}
260260

261261
// CHECK-LABEL: @_inheritsConvenienceInitializers class IsolatedDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
262-
// CHECK: @objc @FirstActor deinit
262+
// CHECK: {{(@objc )?}}@FirstActor deinit
263263
// CHECK: }
264264
// CHECK-SYMB: // IsolatedDeinitInheritNonisolated.__isolated_deallocating_deinit
265265
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -275,7 +275,7 @@ class IsolatedDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
275275
}
276276

277277
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class DifferentIsolatedDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
278-
// CHECK: @objc @SecondActor deinit
278+
// CHECK: {{(@objc )?}}@SecondActor deinit
279279
// CHECK: }
280280
// CHECK-SYMB: // DifferentIsolatedDeinitInheritNonisolated.__isolated_deallocating_deinit
281281
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: SecondActor
@@ -296,7 +296,7 @@ class DifferentIsolatedDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
296296
// MARK: - Part 2.3 - Base class with isolated deinit
297297

298298
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ImplicitDeinitInheritIsolated1 : BaseWithDeinitIsolatedOnFirstActor {
299-
// CHECK: @objc @FirstActor deinit
299+
// CHECK: {{(@objc )?}}@FirstActor deinit
300300
// CHECK: }
301301
// CHECK-SYMB: // ImplicitDeinitInheritIsolated1.__isolated_deallocating_deinit
302302
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -310,7 +310,7 @@ class ImplicitDeinitInheritIsolated1: BaseWithDeinitIsolatedOnFirstActor {
310310
}
311311

312312
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ExplicitDeinitIsolated1 : BaseWithDeinitIsolatedOnFirstActor {
313-
// CHECK: @objc @FirstActor deinit
313+
// CHECK: {{(@objc )?}}@FirstActor deinit
314314
// CHECK: }
315315
// CHECK-SYMB: // ExplicitDeinitIsolated1.__isolated_deallocating_deinit
316316
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -337,7 +337,7 @@ class NonisolatedDeinitIsolated1: BaseWithDeinitIsolatedOnFirstActor {
337337
#endif
338338

339339
// CHECK-LABEL: @_inheritsConvenienceInitializers class IsolatedDeinitIsolated1 : BaseWithDeinitIsolatedOnFirstActor {
340-
// CHECK: @objc @FirstActor deinit
340+
// CHECK: {{(@objc )?}}@FirstActor deinit
341341
// CHECK: }
342342
// CHECK-SYMB: // IsolatedDeinitIsolated1.__isolated_deallocating_deinit
343343
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: FirstActor
@@ -365,7 +365,7 @@ class DifferentIsolatedDeinitIsolated1: BaseWithDeinitIsolatedOnFirstActor {
365365
// MARK: - Part 2.4 - Base class with isolated deinit with different actor
366366

367367
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ImplicitDeinitInheritIsolated2 : BaseWithDeinitIsolatedOnSecondActor {
368-
// CHECK: @objc @SecondActor deinit
368+
// CHECK: {{(@objc )?}}@SecondActor deinit
369369
// CHECK: }
370370
// CHECK-SYMB: // ImplicitDeinitInheritIsolated2.__isolated_deallocating_deinit
371371
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: SecondActor
@@ -379,7 +379,7 @@ class ImplicitDeinitInheritIsolated2: BaseWithDeinitIsolatedOnSecondActor {
379379
}
380380

381381
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ExplicitDeinitIsolated2 : BaseWithDeinitIsolatedOnSecondActor {
382-
// CHECK: @objc @SecondActor deinit
382+
// CHECK: {{(@objc )?}}@SecondActor deinit
383383
// CHECK: }
384384
// CHECK-SYMB: // ExplicitDeinitIsolated2.__isolated_deallocating_deinit
385385
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: SecondActor
@@ -417,7 +417,7 @@ class IsolatedDeinitIsolated2: BaseWithDeinitIsolatedOnSecondActor {
417417
#endif
418418

419419
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class DifferentIsolatedDeinitIsolated2 : BaseWithDeinitIsolatedOnSecondActor {
420-
// CHECK: @objc @SecondActor deinit
420+
// CHECK: {{(@objc )?}}@SecondActor deinit
421421
// CHECK: }
422422
// CHECK-SYMB: // DifferentIsolatedDeinitIsolated2.__isolated_deallocating_deinit
423423
// CHECK-SYMB-NEXT: // Isolation: global_actor. type: SecondActor

‎test/Concurrency/deinit_isolation_import/test.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
// RUN: cp -R $INPUT_DIR/Beta.framework %t/Frameworks/
1111
// RUN: %empty-directory(%t/Frameworks/Beta.framework/Headers/)
1212
// RUN: cp $INPUT_DIR/Beta.h %t/Frameworks/Beta.framework/Headers/Beta.h
13-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks
14-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s
15-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s
13+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks
14+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s
15+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s
1616

1717
// REQUIRES: concurrency
1818
// REQUIRES: objc_interop

‎test/Concurrency/deinit_isolation_objc.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -parse-as-library -emit-silgen -verify %s
2-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -verify %s
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
44

55
// REQUIRES: concurrency
66
// REQUIRES: objc_interop

‎test/Concurrency/deinit_isolation_tbd.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s
22

3-
import Foundation
4-
53
public class Foo {
64
@MainActor
75
deinit {}

‎test/Distributed/Runtime/distributed_actor_deinit.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-stdlib -parse-as-library) | %FileCheck %s
22

3+
// REQUIRES: libdispatch
34
// REQUIRES: executable_test
45
// REQUIRES: concurrency
56
// REQUIRES: distributed

‎test/SourceKit/InterfaceGen/gen_swift_module.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ func f(s : inout [Int]) {
66

77
// RUN: %empty-directory(%t.mod)
88
// RUN: %empty-directory(%t.mod/mcp)
9-
// RUN: %swift -emit-module -o %t.mod/swift_mod.swiftmodule %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
9+
// RUN: %swift -emit-module -o %t.mod/swift_mod.swiftmodule %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -disable-objc-interop
1010
// RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -Xfrontend -disable-implicit-concurrency-module-import -Xfrontend -disable-implicit-string-processing-module-import -I %t.mod > %t.response
1111
// RUN: %diff -u %s.response %t.response
1212

@@ -30,6 +30,6 @@ func f(s : inout [Int]) {
3030
// Test we can generate the interface of a module loaded via a .swiftinterface file correctly
3131

3232
// RUN: %empty-directory(%t.mod)
33-
// RUN: %swift -emit-module -o /dev/null -emit-module-interface-path %t.mod/swift_mod.swiftinterface -O %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
33+
// RUN: %swift -emit-module -o /dev/null -emit-module-interface-path %t.mod/swift_mod.swiftinterface -O %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -disable-objc-interop
3434
// RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -Xfrontend -disable-implicit-concurrency-module-import -Xfrontend -disable-implicit-string-processing-module-import -I %t.mod -module-cache-path %t.mod/mcp > %t.response
3535
// RUN: %diff -u %s.from_swiftinterface.response %t.response

0 commit comments

Comments
 (0)