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

abertelrud · web-flow · commit a408582c9d20 · 2021-03-09T12:03:31.000-08:00
rdar://75172724
diff --git a/Tests/CommandsTests/RunToolTests.swift b/Tests/CommandsTests/RunToolTests.swift
@@ -24,7 +24,7 @@ final class RunToolTests: XCTestCase {
 
     func testUsage() throws {
         let stdout = try execute(["-help"]).stdout
-        XCTAssert(stdout.contains("USAGE: swift run <options>"), "got stdout:\n" + 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
`@@ -24,7 +24,7 @@ final class RunToolTests: XCTestCase {`
`24`	`24`
`25`	`25`	`func testUsage() throws {`
`26`	`26`	`let stdout = try execute(["-help"]).stdout`
`27`		`- XCTAssert(stdout.contains("USAGE: swift run <options>"), "got stdout:\n" + stdout)`
	`27`	`+ XCTAssert(stdout.contains("USAGE: swift run <options>") \|\| stdout.contains("USAGE: swift run [<options>]"), "got stdout:\n" + stdout)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`func testSeeAlso() throws {`