Incorporate feedback

Author: grynspan

Sources/Commands/SwiftTestTool.swift

@@ -237,53 +237,47 @@ public struct SwiftTestTool: SwiftCommand {
             let tests = try testSuites
                 .filteredTests(specifier: options.testCaseSpecifier)
                 .skippedTests(specifier: options.skippedTests(fileSystem: swiftTool.fileSystem))
-            var testResults = [ParallelTestRunner.TestResult]()
 
             // If there were no matches, emit a warning and exit.
             if tests.isEmpty {
                 swiftTool.observabilityScope.emit(.noMatchingTests)
-            } else {
-                // 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 {
-                    try swiftTool.fileSystem.removeFileTree(buildParameters.codeCovPath)
-                }
+                try generateXUnitOutputIfRequested(for: [], swiftTool: swiftTool)
+                return
+            }
 
-                // Run the tests using the parallel runner.
-                let runner = ParallelTestRunner(
-                    bundlePaths: testProducts.map { $0.bundlePath },
-                    cancellator: swiftTool.cancellator,
-                    toolchain: toolchain,
-                    numJobs: options.numberOfWorkers ?? ProcessInfo.processInfo.activeProcessorCount,
-                    buildOptions: globalOptions.build,
-                    buildParameters: buildParameters,
-                    shouldOutputSuccess: swiftTool.logLevel <= .info,
-                    observabilityScope: swiftTool.observabilityScope
-                )
-
-                testResults = try runner.run(tests)
-
-                // process code Coverage if request
-                if self.options.enableCodeCoverage, runner.ranSuccessfully {
-                    try processCodeCoverage(testProducts, swiftTool: swiftTool, library: .xctest)
-                }
+            // 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 {
+                try swiftTool.fileSystem.removeFileTree(buildParameters.codeCovPath)
+            }
 
-                if !runner.ranSuccessfully {
-                    swiftTool.executionStatus = .failure
-                }
+            // Run the tests using the parallel runner.
+            let runner = ParallelTestRunner(
+                bundlePaths: testProducts.map { $0.bundlePath },
+                cancellator: swiftTool.cancellator,
+                toolchain: toolchain,
+                numJobs: options.numberOfWorkers ?? ProcessInfo.processInfo.activeProcessorCount,
+                buildOptions: globalOptions.build,
+                buildParameters: buildParameters,
+                shouldOutputSuccess: swiftTool.logLevel <= .info,
+                observabilityScope: swiftTool.observabilityScope
+            )
 
-                if self.options.enableExperimentalTestOutput, !runner.ranSuccessfully {
-                    try Self.handleTestOutput(buildParameters: buildParameters, packagePath: testProducts[0].packagePath)
-                }
+            let testResults = try runner.run(tests)
+
+            try generateXUnitOutputIfRequested(for: testResults, swiftTool: swiftTool)
+
+            // process code Coverage if request
+            if self.options.enableCodeCoverage, runner.ranSuccessfully {
+                try processCodeCoverage(testProducts, swiftTool: swiftTool, library: .xctest)
+            }
+
+            if !runner.ranSuccessfully {
+                swiftTool.executionStatus = .failure
             }
 
-            // Generate xUnit file if requested
-            if let xUnitOutput = options.xUnitOutput {
-                let generator = XUnitGenerator(
-                    fileSystem: swiftTool.fileSystem,
-                    results: testResults
-                )
-                try generator.generate(at: xUnitOutput)
+            if self.options.enableExperimentalTestOutput, !runner.ranSuccessfully {
+                try Self.handleTestOutput(buildParameters: buildParameters, packagePath: testProducts[0].packagePath)
             }
         }
     }
@@ -325,6 +319,19 @@ public struct SwiftTestTool: SwiftCommand {
         }
     }
 
+    /// Generate xUnit file if requested.
+    private func generateXUnitOutputIfRequested(for testResults: [ParallelTestRunner.TestResult], swiftTool: SwiftTool) throws {
+        guard let xUnitOutput = options.xUnitOutput else {
+            return
+        }
+
+        let generator = XUnitGenerator(
+            fileSystem: swiftTool.fileSystem,
+            results: testResults
+        )
+        try generator.generate(at: xUnitOutput)
+    }
+
     // MARK: - swift-testing
 
     private func swiftTestingRun(_ swiftTool: SwiftTool) throws {