Handle both SwiftArgParser 0.3.x and 0.4.x output. (#3338) (#3418)

shahmishal · abertelrud · web-flow · commit cfbe3609f872 · 2021-04-20T11:03:15.000-07:00
rdar://75172724 (cherry picked from commit a408582) Co-authored-by: Anders Bertelrud <anders@apple.com>
diff --git a/Tests/CommandsTests/RunToolTests.swift b/Tests/CommandsTests/RunToolTests.swift
@@ -23,7 +23,8 @@ final class RunToolTests: XCTestCase {
     }
 
     func testUsage() throws {
-        XCTAssert(try execute(["--help"]).stdout.contains("USAGE: swift run <options>"))
+        let stdout = try execute(["-help"]).stdout
+        XCTAssert(stdout.contains("USAGE: swift run <options>") || stdout.contains("USAGE: swift run [<options>]"), "got stdout:\n" + stdout)
     }
 
     func testSeeAlso() throws {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ final class RunToolTests: XCTestCase {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func testUsage() throws {`
`26`		`- XCTAssert(try execute(["--help"]).stdout.contains("USAGE: swift run <options>"))`
	`26`	`+ let stdout = try execute(["-help"]).stdout`
	`27`	`+ XCTAssert(stdout.contains("USAGE: swift run <options>") \|\| stdout.contains("USAGE: swift run [<options>]"), "got stdout:\n" + stdout)`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`func testSeeAlso() throws {`