Remove uses of temp_await from SwiftTestCommand (#7382)

This prevents possible deadlocks that can be caused by blocking Swift Concurrency threads with semaphores.

Author: MaxDesiatov

Sources/Commands/SwiftTestCommand.swift

@@ -179,7 +179,7 @@ package enum TestOutput: String, ExpressibleByArgument {
 }
 
 /// swift-test tool namespace
-package struct SwiftTestCommand: SwiftCommand {
+package struct SwiftTestCommand: AsyncSwiftCommand {
     package static var configuration = CommandConfiguration(
         commandName: "test",
         _superCommandName: "swift",
@@ -200,7 +200,7 @@ package struct SwiftTestCommand: SwiftCommand {
 
     // MARK: - XCTest
 
-    private func xctestRun(_ swiftCommandState: SwiftCommandState) throws {
+    private func xctestRun(_ swiftCommandState: SwiftCommandState) async throws {
         // validate XCTest available on darwin based systems
         let toolchain = try swiftCommandState.getTargetToolchain()
         let isHostTestingAvailable = try swiftCommandState.getHostToolchain().swiftSDK.supportsTesting
@@ -218,7 +218,7 @@ package struct SwiftTestCommand: SwiftCommand {
         let testProducts = try buildTestsIfNeeded(swiftCommandState: swiftCommandState, library: .xctest)
         if !self.options.shouldRunInParallel {
             let xctestArgs = try xctestArgs(for: testProducts, swiftCommandState: swiftCommandState)
-            try runTestProducts(
+            try await runTestProducts(
                 testProducts,
                 additionalArguments: xctestArgs,
                 buildParameters: buildParameters,
@@ -269,7 +269,7 @@ package struct SwiftTestCommand: SwiftCommand {
 
             // process code Coverage if request
             if self.options.enableCodeCoverage, runner.ranSuccessfully {
-                try processCodeCoverage(testProducts, swiftCommandState: swiftCommandState, library: .xctest)
+                try await processCodeCoverage(testProducts, swiftCommandState: swiftCommandState, library: .xctest)
             }
 
             if !runner.ranSuccessfully {
@@ -337,11 +337,11 @@ package struct SwiftTestCommand: SwiftCommand {
 
     // MARK: - swift-testing
 
-    private func swiftTestingRun(_ swiftCommandState: SwiftCommandState) throws {
+    private func swiftTestingRun(_ swiftCommandState: SwiftCommandState) async throws {
         let buildParameters = try swiftCommandState.buildParametersForTest(options: self.options, library: .swiftTesting)
         let testProducts = try buildTestsIfNeeded(swiftCommandState: swiftCommandState, library: .swiftTesting)
         let additionalArguments = Array(CommandLine.arguments.dropFirst())
-        try runTestProducts(
+        try await runTestProducts(
             testProducts,
             additionalArguments: additionalArguments,
             buildParameters: buildParameters,
@@ -352,7 +352,7 @@ package struct SwiftTestCommand: SwiftCommand {
 
     // MARK: - Common implementation
 
-    package func run(_ swiftCommandState: SwiftCommandState) throws {
+    package func run(_ swiftCommandState: SwiftCommandState) async throws {
         do {
             // Validate commands arguments
             try self.validateArguments(observabilityScope: swiftCommandState.observabilityScope)
@@ -369,10 +369,10 @@ package struct SwiftTestCommand: SwiftCommand {
             try command.run(swiftCommandState)
         } else {
             if try options.testLibraryOptions.enableSwiftTestingLibrarySupport(swiftCommandState: swiftCommandState) {
-                try swiftTestingRun(swiftCommandState)
+                try await swiftTestingRun(swiftCommandState)
             }
             if options.testLibraryOptions.enableXCTestSupport {
-                try xctestRun(swiftCommandState)
+                try await xctestRun(swiftCommandState)
             }
         }
     }
@@ -383,7 +383,7 @@ package struct SwiftTestCommand: SwiftCommand {
         buildParameters: BuildParameters,
         swiftCommandState: SwiftCommandState,
         library: BuildParameters.Testing.Library
-    ) throws {
+    ) async throws {
         // Clean out the code coverage directory that may contain stale
         // profraw files from a previous run of the code coverage tool.
         if self.options.enableCodeCoverage {
@@ -418,7 +418,7 @@ package struct SwiftTestCommand: SwiftCommand {
         }
 
         if self.options.enableCodeCoverage, ranSuccessfully {
-            try processCodeCoverage(testProducts, swiftCommandState: swiftCommandState, library: library)
+            try await processCodeCoverage(testProducts, swiftCommandState: swiftCommandState, library: library)
         }
 
         if self.options.enableExperimentalTestOutput, !ranSuccessfully {
@@ -462,16 +462,13 @@ package struct SwiftTestCommand: SwiftCommand {
         _ testProducts: [BuiltTestProduct],
         swiftCommandState: SwiftCommandState,
         library: BuildParameters.Testing.Library
-    ) throws {
+    ) async throws {
         let workspace = try swiftCommandState.getActiveWorkspace()
         let root = try swiftCommandState.getWorkspaceRoot()
-        let rootManifests = try temp_await {
-            workspace.loadRootManifests(
-                packages: root.packages,
-                observabilityScope: swiftCommandState.observabilityScope,
-                completion: $0
-            )
-        }
+        let rootManifests = try await workspace.loadRootManifests(
+            packages: root.packages,
+            observabilityScope: swiftCommandState.observabilityScope
+        )
         guard let rootManifest = rootManifests.values.first else {
             throw StringError("invalid manifests at \(root.packages)")
         }

Sources/SPMTestSupport/XCTAssertHelpers.swift

@@ -170,6 +170,16 @@ package func XCTAssertAsyncFalse(
     XCTAssertFalse(result, message(), file: file, line: line)
 }
 
+package func XCTAssertAsyncNil(
+    _ expression: @autoclosure () async throws -> Any?,
+    _ message: @autoclosure () -> String = "",
+    file: StaticString = #filePath,
+    line: UInt = #line
+) async rethrows {
+    let result = try await expression()
+    XCTAssertNil(result, message(), file: file, line: line)
+}
+
 package func XCTAssertThrowsCommandExecutionError<T>(
     _ expression: @autoclosure () throws -> T,
     _ message: @autoclosure () -> String = "",

Sources/swift-package-manager/SwiftPM.swift

@@ -44,7 +44,7 @@ struct SwiftPM {
         case "swift-experimental-sdk":
             await SwiftSDKCommand.main()
         case "swift-test":
-            SwiftTestCommand.main()
+            await SwiftTestCommand.main()
         case "swift-run":
             await SwiftRunCommand.main()
         case "swift-package-collection":

Sources/swift-test/CMakeLists.txt

@@ -7,9 +7,12 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_executable(swift-test
-  main.swift)
+  Entrypoint.swift)
 target_link_libraries(swift-test PRIVATE
   Commands)
 
+target_compile_options(swift-test PRIVATE
+  -parse-as-library)
+
 install(TARGETS swift-test
   RUNTIME DESTINATION bin)

Sources/swift-test/main.swift renamed to Sources/swift-test/Entrypoint.swift

@@ -12,4 +12,9 @@
 
 import Commands
 
-SwiftTestCommand.main()
+@main
+struct Entrypoint {
+    static func main() async {
+        await SwiftTestCommand.main()
+    }
+}

Tests/BuildTests/PluginsBuildPlanTests.swift

@@ -19,7 +19,7 @@ import PackageModel
 final class PluginsBuildPlanTests: XCTestCase {
     func testBuildToolsDatabasePath() throws {
         try fixture(name: "Miscellaneous/Plugins/MySourceGenPlugin") { fixturePath in
-            let (stdout, stderr) = try executeSwiftBuild(fixturePath)
+            let (stdout, _) = try executeSwiftBuild(fixturePath)
             XCTAssertMatch(stdout, .contains("Build complete!"))
             XCTAssertTrue(localFileSystem.exists(fixturePath.appending(RelativePath(".build/plugins/tools/build.db"))))
         }

Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift

@@ -151,7 +151,7 @@ final class PackageGraphPerfTests: XCTestCasePerf {
         measure {
             do {
                 for _ in 0..<N {
-                    _ = try loadPackageGraph(
+                    _ = try loadModulesGraph(
                         fileSystem: fs,
                         manifests: [root] + packageSequence,
                         observabilityScope: observability.topScope