Enable running tests from test/Concurrency/ directory in freestanding/minimal presets (#61835)

kubamracek · web-flow · commit 7853184ed614 · 2022-11-04T09:07:27.000-07:00
* Enable running tests from test/Concurrency/ directory in freestanding/minimal presets

* Mark failing Concurrency tests as XFAIL/SKIP on freestanding/minimal
diff --git a/test/Concurrency/Backdeploy/mangling.swift b/test/Concurrency/Backdeploy/mangling.swift
@@ -16,6 +16,7 @@
 // REQUIRES: executable_test
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
+// UNSUPPORTED: freestanding
 
 actor MyActor { }
 
diff --git a/test/Concurrency/Backdeploy/objc_actor.swift b/test/Concurrency/Backdeploy/objc_actor.swift
@@ -5,6 +5,7 @@
 // REQUIRES: OS=macosx
 // REQUIRES: executable_test
 // REQUIRES: concurrency_runtime
+// REQUIRES: objc_interop
 // UNSUPPORTED: back_deployment_runtime
 
 import Foundation
diff --git a/test/Concurrency/Runtime/actor_counters_freestanding.swift b/test/Concurrency/Runtime/actor_counters_freestanding.swift
@@ -4,6 +4,9 @@
 // REQUIRES: concurrency
 // REQUIRES: freestanding
 
+// rdar://101938326
+// UNSUPPORTED: freestanding
+
 // rdar://76038845
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
@@ -97,11 +100,9 @@ func runTest(numCounters: Int, numWorkers: Int) {
 @available(SwiftStdlib 5.1, *)
 @main struct Main {
   static func main() {
-    // Useful for debugging: specify counter/worker/iteration counts
-    let args = CommandLine.arguments
-    let numCounters = args.count >= 2 ? Int(args[1])! : 10
-    iterations = args.count >= 4 ? Int(args[3])! : 1000
-    let workers = args.count >= 3 ? Int(args[2])! : 100
+    let numCounters = 10
+    iterations = 1000
+    let workers = 100
     print("counters: \(counters), workers: \(workers), iterations: \(iterations)")
     runTest(numCounters: numCounters, numWorkers: workers)
   }
diff --git a/test/Concurrency/Runtime/async_initializer.swift b/test/Concurrency/Runtime/async_initializer.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
@@ -137,7 +138,7 @@ struct PrecariousStruct {
     ]
 
     for p in people {
-     print(p.name)
+     print("\(p.name)")
     }
 
     // ----
diff --git a/test/Concurrency/Runtime/async_let_fibonacci.swift b/test/Concurrency/Runtime/async_let_fibonacci.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
@@ -42,7 +43,7 @@ func asyncFib(_ n: Int) async -> Int {
 func runFibonacci(_ n: Int) async {
   let result = await asyncFib(n)
 
-  print()
+  print("")
   print("Async fib = \(result), sequential fib = \(fib(n))")
   assert(result == fib(n))
 }
diff --git a/test/Concurrency/Runtime/async_let_throws.swift b/test/Concurrency/Runtime/async_let_throws.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_task_detach.swift b/test/Concurrency/Runtime/async_task_detach.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_task_handle_cancellation.swift b/test/Concurrency/Runtime/async_task_handle_cancellation.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_task_locals_spawn_let.swift b/test/Concurrency/Runtime/async_task_locals_spawn_let.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_task_locals_synchronous_bind.swift b/test/Concurrency/Runtime/async_task_locals_synchronous_bind.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_task_locals_wrapper.swift b/test/Concurrency/Runtime/async_task_locals_wrapper.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_task_yield.swift b/test/Concurrency/Runtime/async_task_yield.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
diff --git a/test/Concurrency/Runtime/async_taskgroup_throw_recover.swift b/test/Concurrency/Runtime/async_taskgroup_throw_recover.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/async_taskgroup_throw_rethrow.swift b/test/Concurrency/Runtime/async_taskgroup_throw_rethrow.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// REQUIRES: reflection
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/checked_continuation.swift b/test/Concurrency/Runtime/checked_continuation.swift
@@ -3,6 +3,7 @@
 // REQUIRES: executable_test
 // REQUIRES: concurrency
 // REQUIRES: concurrency_runtime
+// REQUIRES: reflection
 // UNSUPPORTED: back_deployment_runtime
 
 import _Concurrency
diff --git a/test/Concurrency/Runtime/class_resilience.swift b/test/Concurrency/Runtime/class_resilience.swift
@@ -10,6 +10,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/continuation_validation.swift b/test/Concurrency/Runtime/continuation_validation.swift
@@ -8,6 +8,7 @@
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
 // UNSUPPORTED: use_os_stdlib
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 
diff --git a/test/Concurrency/Runtime/custom_executors.swift b/test/Concurrency/Runtime/custom_executors.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: concurrency
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 // UNSUPPORTED: back_deployment_runtime
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/effectful_properties.swift b/test/Concurrency/Runtime/effectful_properties.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/exclusivity.swift b/test/Concurrency/Runtime/exclusivity.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
diff --git a/test/Concurrency/Runtime/exclusivity_custom_executors.swift b/test/Concurrency/Runtime/exclusivity_custom_executors.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: concurrency
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // UNSUPPORTED: back_deployment_runtime
diff --git a/test/Concurrency/Runtime/executor_deinit2.swift b/test/Concurrency/Runtime/executor_deinit2.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/protocol_resilience.swift b/test/Concurrency/Runtime/protocol_resilience.swift
@@ -10,6 +10,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/task_creation.swift b/test/Concurrency/Runtime/task_creation.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // rdar://76038845
 // REQUIRES: concurrency_runtime
diff --git a/test/Concurrency/Runtime/task_destruction.swift b/test/Concurrency/Runtime/task_destruction.swift
@@ -2,6 +2,7 @@
 // REQUIRES: executable_test
 // REQUIRES: concurrency
 // REQUIRES: concurrency_runtime
+// UNSUPPORTED: freestanding
 
 // UNSUPPORTED: back_deployment_runtime
 
diff --git a/test/Concurrency/async_main.swift b/test/Concurrency/async_main.swift
@@ -20,10 +20,10 @@ func asyncFunc() async {
 
 @main struct MyProgram {
   static func main() async throws {
-    print(foo)
+    print("\(foo)")
     foo += 1
     await asyncFunc()
-    print(foo)
+    print("\(foo)")
   }
 }
 
diff --git a/test/Concurrency/async_main_throws_prints_error.swift b/test/Concurrency/async_main_throws_prints_error.swift
@@ -6,6 +6,7 @@
 
 // REQUIRES: concurrency
 // REQUIRES: executable_test
+// REQUIRES: reflection
 // REQUIRES: OS=macosx || OS=ios
 
 // rdar://76038845
diff --git a/test/Concurrency/throwing.swift b/test/Concurrency/throwing.swift
@@ -2,6 +2,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
+// UNSUPPORTED: freestanding
 
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -2410,7 +2410,7 @@ native-llvm-tools-path=%(toolchain_path)s
 native-clang-tools-path=%(toolchain_path)s
 
 build-ninja
-lit-args=--filter=':: stdlib/' -v
+lit-args=--filter=':: (stdlib/|Concurrency/)' -v
 only-executable-test
 
 [preset: stdlib_RD_standalone,build]

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`// REQUIRES: executable_test`
`4`	`4`	`// REQUIRES: concurrency`
	`5`	`+// UNSUPPORTED: freestanding`
`5`	`6`
`6`	`7`	`// rdar://76038845`
`7`	`8`	`// REQUIRES: concurrency_runtime`
`@@ -137,7 +138,7 @@ struct PrecariousStruct {`
`137`	`138`	`]`
`138`	`139`
`139`	`140`	`for p in people {`
`140`		`- print(p.name)`
	`141`	`+ print("\(p.name)")`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`// ----`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ func asyncFunc() async {`
`20`	`20`
`21`	`21`	`@main struct MyProgram {`
`22`	`22`	`static func main() async throws {`
`23`		`- print(foo)`
	`23`	`+ print("\(foo)")`
`24`	`24`	`foo += 1`
`25`	`25`	`await asyncFunc()`
`26`		`- print(foo)`
	`26`	`+ print("\(foo)")`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`