Skip to content

Commit 7bab494

Browse files
committed
Remove test error conditions for Linux testing
In Linux testing (e.g. in our CI) these currently generate non-fatal 'error:' messages. This makes human scanning of CI logs more difficult than it should be
1 parent aa10427 commit 7bab494

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,6 @@ final class SwiftDriverTests: XCTestCase {
459459

460460
XCTAssertEqual(try Driver(args: ["swiftc", "-j", "4"]).numParallelJobs, 4)
461461

462-
XCTAssertNil(try Driver(args: ["swiftc", "-j", "0"]).numParallelJobs)
463-
464462
var env = ProcessEnv.vars
465463
env["SWIFTC_MAXIMUM_DETERMINISM"] = "1"
466464
XCTAssertEqual(try Driver(args: ["swiftc", "-j", "4"], env: env).numParallelJobs, 1)
@@ -2879,7 +2877,7 @@ final class SwiftDriverTests: XCTestCase {
28792877

28802878
do {
28812879
// Calls using the driver to link a library shouldn't trigger an emit-module job, like in LLDB tests.
2882-
var driver = try Driver(args: ["swiftc", "-emit-library", "foo.swiftmodule", "foo.o", "-emit-module-path", "foo.swiftmodule", "-experimental-emit-module-separately", "-target", "x86_64-apple-macosx10.15"],
2880+
var driver = try Driver(args: ["swiftc", "-emit-library", "foo.swiftmodule", "foo.o", "-emit-module-path", "foo.swiftmodule", "-experimental-emit-module-separately", "-target", "x86_64-apple-macosx10.15", "-module-name", "Test"],
28832881
env: envVars)
28842882
let plannedJobs = try driver.planBuild()
28852883
XCTAssertEqual(plannedJobs.count, 1)
@@ -5490,7 +5488,8 @@ final class SwiftDriverTests: XCTestCase {
54905488
func testIndexFilePathHandling() throws {
54915489
do {
54925490
var driver = try Driver(args: ["swiftc", "-index-file", "-index-file-path",
5493-
"bar.swift", "foo.swift", "bar.swift", "baz.swift"])
5491+
"bar.swift", "foo.swift", "bar.swift", "baz.swift",
5492+
"-module-name", "Test"])
54945493
let plannedJobs = try driver.planBuild()
54955494
XCTAssertEqual(plannedJobs.count, 1)
54965495
XCTAssertEqual(plannedJobs[0].kind, .compile)

0 commit comments

Comments
 (0)