Merge pull request #2526 from spevans/pr_sr_11408

Author: swift-ci

Foundation/Process.swift

@@ -409,6 +409,11 @@ open class Process: NSObject {
         // Dispatch the manager thread if it isn't already running
         Process.setup()
 
+        // Check that the process isnt run more than once
+        guard hasStarted == false && hasFinished == false else {
+            throw NSError(domain: NSCocoaErrorDomain, code: NSExecutableLoadError)
+        }
+
         // Ensure that the launch path is set
         guard let launchPath = self.executableURL?.path else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSFileNoSuchFileError)

TestFoundation/TestProcess.swift

@@ -333,15 +333,26 @@ class TestProcess : XCTestCase {
         XCTAssertEqual(fm.currentDirectoryPath, cwd)
 
         do {
+            // Check running the process twice throws an error.
             let process = Process()
             process.executableURL = xdgTestHelperURL()
             process.arguments = ["--exit", "0"]
-            process.currentDirectoryURL = URL(fileURLWithPath: "/.../_no_such_directory", isDirectory: true)
-            try process.run()
-            XCTFail("Executed \(xdgTestHelperURL().path) with invalid currentDirectoryURL")
-            process.terminate()
+            XCTAssertNoThrow(try process.run())
             process.waitUntilExit()
-        } catch {
+            XCTAssertThrowsError(try process.run()) {
+                let nserror = ($0 as! NSError)
+                XCTAssertEqual(nserror.domain, NSCocoaErrorDomain)
+                let code = CocoaError(_nsError: nserror).code
+                XCTAssertEqual(code, .executableLoad)
+            }
+        }
+
+        do {
+            let process = Process()
+            process.executableURL = xdgTestHelperURL()
+            process.arguments = ["--exit", "0"]
+            process.currentDirectoryURL = URL(fileURLWithPath: "/.../_no_such_directory", isDirectory: true)
+            XCTAssertThrowsError(try process.run())
         }
         XCTAssertEqual(fm.currentDirectoryPath, cwd)
 
@@ -350,11 +361,7 @@ class TestProcess : XCTestCase {
             process.executableURL = URL(fileURLWithPath: "/..", isDirectory: false)
             process.arguments = []
             process.currentDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory())
-            try process.run()
-            XCTFail("Somehow executed a directory!")
-            process.terminate()
-            process.waitUntilExit()
-        } catch {
+            XCTAssertThrowsError(try process.run())
         }
         XCTAssertEqual(fm.currentDirectoryPath, cwd)
         fm.changeCurrentDirectoryPath(cwd)