Skip to content

Commit 3884e9f

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 3907942 commit 3884e9f

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
@@ -476,8 +476,6 @@ final class SwiftDriverTests: XCTestCase {
476476

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

479-
XCTAssertNil(try Driver(args: ["swiftc", "-j", "0"]).numParallelJobs)
480-
481479
var env = ProcessEnv.vars
482480
env["SWIFTC_MAXIMUM_DETERMINISM"] = "1"
483481
XCTAssertEqual(try Driver(args: ["swiftc", "-j", "4"], env: env).numParallelJobs, 1)
@@ -2896,7 +2894,7 @@ final class SwiftDriverTests: XCTestCase {
28962894

28972895
do {
28982896
// Calls using the driver to link a library shouldn't trigger an emit-module job, like in LLDB tests.
2899-
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"],
2897+
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"],
29002898
env: envVars)
29012899
let plannedJobs = try driver.planBuild()
29022900
XCTAssertEqual(plannedJobs.count, 1)
@@ -5523,7 +5521,8 @@ final class SwiftDriverTests: XCTestCase {
55235521
func testIndexFilePathHandling() throws {
55245522
do {
55255523
var driver = try Driver(args: ["swiftc", "-index-file", "-index-file-path",
5526-
"bar.swift", "foo.swift", "bar.swift", "baz.swift"])
5524+
"bar.swift", "foo.swift", "bar.swift", "baz.swift",
5525+
"-module-name", "Test"])
55275526
let plannedJobs = try driver.planBuild()
55285527
XCTAssertEqual(plannedJobs.count, 1)
55295528
XCTAssertEqual(plannedJobs[0].kind, .compile)

0 commit comments

Comments
 (0)