Merge pull request #25 from hartbit/split-stdout-stderr

Split process output between stdout and stderr

Author: aciidgh

Sources/TSCTestSupport/Product.swift

@@ -57,7 +57,7 @@ extension Product {
         _ args: [String],
         packagePath: AbsolutePath? = nil,
         env: [String: String]? = nil
-    ) throws -> String {
+    ) throws -> (stdout: String, stderr: String) {
 
         let result = try executeProcess(
             args, packagePath: packagePath,
@@ -67,8 +67,7 @@ extension Product {
         let stderr = try result.utf8stderrOutput()
 
         if result.exitStatus == .terminated(code: 0) {
-            // FIXME: We should return stderr separately.
-            return output + stderr
+            return (stdout: output, stderr: stderr)
         }
         throw SwiftPMProductError.executionFailure(
             error: ProcessResult.Error.nonZeroExit(result),

Tests/TSCUtilityTests/ArgumentParserTests.swift

@@ -480,29 +480,29 @@ class ArgumentParserTests: XCTestCase {
     func testPathArgument() {
         // Test that relative path is resolved.
         do {
-            let actual = try! TestSupportExecutable.execute(["pathArgumentTest", "some/path"]).spm_chomp()
+            let (stdout, _) = try! TestSupportExecutable.execute(["pathArgumentTest", "some/path"])
             let expected = localFileSystem.currentWorkingDirectory!.appending(RelativePath("some/path")).pathString
-            XCTAssertEqual(actual, expected)
+            XCTAssertEqual(stdout.spm_chomp(), expected)
         }
 
         // Test that relative path starting with ./ is resolved.
         do {
-            let actual = try! TestSupportExecutable.execute(["pathArgumentTest", "./some/path"]).spm_chomp()
+            let (stdout, _) = try! TestSupportExecutable.execute(["pathArgumentTest", "./some/path"])
             let expected = localFileSystem.currentWorkingDirectory!.appending(RelativePath("./some/path")).pathString
-            XCTAssertEqual(actual, expected)
+            XCTAssertEqual(stdout.spm_chomp(), expected)
         }
 
         // Test that relative path starting with ../ is resolved.
         do {
-            let actual = try! TestSupportExecutable.execute(["pathArgumentTest", "../other/path"]).spm_chomp()
+            let (stdout, _) = try! TestSupportExecutable.execute(["pathArgumentTest", "../other/path"])
             let expected = localFileSystem.currentWorkingDirectory!.appending(RelativePath("../other/path")).pathString
-            XCTAssertEqual(actual, expected)
+            XCTAssertEqual(stdout.spm_chomp(), expected)
         }
 
         // Test that absolute path is resolved.
         do {
-            let actual = try! TestSupportExecutable.execute(["pathArgumentTest", "/bin/echo"]).spm_chomp()
-            XCTAssertEqual(actual, "/bin/echo")
+            let (stdout, _) = try! TestSupportExecutable.execute(["pathArgumentTest", "/bin/echo"])
+            XCTAssertEqual(stdout.spm_chomp(), "/bin/echo")
         }
     }