Revert "Avoid using temp_await in SwiftTestTool.swift (#7016)"

This reverts commit 759174d.

Author: MaxDesiatov

Sources/Commands/SwiftTestTool.swift

@@ -185,7 +185,7 @@ public enum TestOutput: String, ExpressibleByArgument {
 }
 
 /// swift-test tool namespace
-public struct SwiftTestTool: AsyncSwiftCommand {
+public struct SwiftTestTool: SwiftCommand {
     public static var configuration = CommandConfiguration(
         commandName: "test",
         _superCommandName: "swift",
@@ -206,7 +206,7 @@ public struct SwiftTestTool: AsyncSwiftCommand {
 
     // MARK: - XCTest
 
-    private func xctestRun(_ swiftTool: SwiftTool) async throws {
+    private func xctestRun(_ swiftTool: SwiftTool) throws {
         // validate XCTest available on darwin based systems
         let toolchain = try swiftTool.getTargetToolchain()
         let isHostTestingAvailable = try swiftTool.getHostToolchain().swiftSDK.supportsTesting
@@ -224,13 +224,7 @@ public struct SwiftTestTool: AsyncSwiftCommand {
         let testProducts = try buildTestsIfNeeded(swiftTool: swiftTool, library: .xctest)
         if !self.options.shouldRunInParallel {
             let xctestArgs = try xctestArgs(for: testProducts, swiftTool: swiftTool)
-            try await runTestProducts(
-                testProducts,
-                additionalArguments: xctestArgs,
-                buildParameters: buildParameters,
-                swiftTool: swiftTool,
-                library: .xctest
-            )
+            try runTestProducts(testProducts, additionalArguments: xctestArgs, buildParameters: buildParameters, swiftTool: swiftTool, library: .xctest)
         } else {
             let testSuites = try TestingSupport.getTestSuites(
                 in: testProducts,
@@ -275,7 +269,7 @@ public struct SwiftTestTool: AsyncSwiftCommand {
 
             // process code Coverage if request
             if self.options.enableCodeCoverage, runner.ranSuccessfully {
-                try await processCodeCoverage(testProducts, swiftTool: swiftTool, library: .xctest)
+                try processCodeCoverage(testProducts, swiftTool: swiftTool, library: .xctest)
             }
 
             if !runner.ranSuccessfully {
@@ -340,22 +334,16 @@ public struct SwiftTestTool: AsyncSwiftCommand {
 
     // MARK: - swift-testing
 
-    private func swiftTestingRun(_ swiftTool: SwiftTool) async throws {
+    private func swiftTestingRun(_ swiftTool: SwiftTool) throws {
         let buildParameters = try swiftTool.buildParametersForTest(options: self.options, library: .swiftTesting)
         let testProducts = try buildTestsIfNeeded(swiftTool: swiftTool, library: .swiftTesting)
         let additionalArguments = Array(CommandLine.arguments.dropFirst())
-        try await runTestProducts(
-            testProducts,
-            additionalArguments: additionalArguments,
-            buildParameters: buildParameters,
-            swiftTool: swiftTool,
-            library: .swiftTesting
-        )
+        try runTestProducts(testProducts, additionalArguments: additionalArguments, buildParameters: buildParameters, swiftTool: swiftTool, library: .swiftTesting)
     }
 
     // MARK: - Common implementation
 
-    public func run(_ swiftTool: SwiftTool) async throws {
+    public func run(_ swiftTool: SwiftTool) throws {
         do {
             // Validate commands arguments
             try self.validateArguments(observabilityScope: swiftTool.observabilityScope)
@@ -365,28 +353,22 @@ public struct SwiftTestTool: AsyncSwiftCommand {
         }
 
         if self.options.shouldPrintCodeCovPath {
-            try await printCodeCovPath(swiftTool)
+            try printCodeCovPath(swiftTool)
         } else if self.options._deprecated_shouldListTests {
             // backward compatibility 6/2022 for deprecation of flag into a subcommand
             let command = try List.parse()
             try command.run(swiftTool)
         } else {
             if options.sharedOptions.enableSwiftTestingLibrarySupport {
-                try await swiftTestingRun(swiftTool)
+                try swiftTestingRun(swiftTool)
             }
             if options.sharedOptions.enableXCTestSupport {
-                try await xctestRun(swiftTool)
+                try xctestRun(swiftTool)
             }
         }
     }
 
-    private func runTestProducts(
-        _ testProducts: [BuiltTestProduct],
-        additionalArguments: [String],
-        buildParameters: BuildParameters,
-        swiftTool: SwiftTool,
-        library: BuildParameters.Testing.Library
-    ) async throws {
+    private func runTestProducts(_ testProducts: [BuiltTestProduct], additionalArguments: [String], buildParameters: BuildParameters, swiftTool: SwiftTool, library: BuildParameters.Testing.Library) 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 {
@@ -421,7 +403,7 @@ public struct SwiftTestTool: AsyncSwiftCommand {
         }
 
         if self.options.enableCodeCoverage, ranSuccessfully {
-            try await processCodeCoverage(testProducts, swiftTool: swiftTool, library: library)
+            try processCodeCoverage(testProducts, swiftTool: swiftTool, library: library)
         }
 
         if self.options.enableExperimentalTestOutput, !ranSuccessfully {
@@ -461,18 +443,16 @@ public struct SwiftTestTool: AsyncSwiftCommand {
     }
 
     /// Processes the code coverage data and emits a json.
-    private func processCodeCoverage(
-        _ testProducts: [BuiltTestProduct],
-        swiftTool: SwiftTool,
-        library: BuildParameters.Testing.Library
-    ) async throws {
+    private func processCodeCoverage(_ testProducts: [BuiltTestProduct], swiftTool: SwiftTool, library: BuildParameters.Testing.Library) throws {
         let workspace = try swiftTool.getActiveWorkspace()
         let root = try swiftTool.getWorkspaceRoot()
-        let rootManifests = try await workspace.loadRootManifests(
-            packages: root.packages,
-            observabilityScope: swiftTool.observabilityScope
-        )
-
+        let rootManifests = try temp_await {
+            workspace.loadRootManifests(
+                packages: root.packages,
+                observabilityScope: swiftTool.observabilityScope,
+                completion: $0
+            )
+        }
         guard let rootManifest = rootManifests.values.first else {
             throw StringError("invalid manifests at \(root.packages)")
         }
@@ -568,14 +548,16 @@ public struct SwiftTestTool: AsyncSwiftCommand {
 }
 
 extension SwiftTestTool {
-    func printCodeCovPath(_ swiftTool: SwiftTool) async throws {
+    func printCodeCovPath(_ swiftTool: SwiftTool) throws {
         let workspace = try swiftTool.getActiveWorkspace()
         let root = try swiftTool.getWorkspaceRoot()
-        let rootManifests = try await workspace.loadRootManifests(
-            packages: root.packages,
-            observabilityScope: swiftTool.observabilityScope
-        )
-
+        let rootManifests = try temp_await {
+            workspace.loadRootManifests(
+                packages: root.packages,
+                observabilityScope: swiftTool.observabilityScope,
+                completion: $0
+            )
+        }
         guard let rootManifest = rootManifests.values.first else {
             throw StringError("invalid manifests at \(root.packages)")
         }

Sources/swift-package-manager/SwiftPM.swift

@@ -31,7 +31,7 @@ struct SwiftPM {
         case "swift-experimental-sdk":
             await SwiftSDKTool.main()
         case "swift-test":
-            await SwiftTestTool.main()
+            SwiftTestTool.main()
         case "swift-run":
             SwiftRunTool.main()
         case "swift-package-collection":

Sources/swift-test/CMakeLists.txt

@@ -7,12 +7,9 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_executable(swift-test
-  Entrypoint.swift)
+  main.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/Entrypoint.swift renamed to Sources/swift-test/main.swift

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