Skip to content

Commit a531c3d

Browse files
authored
Merge pull request #1137 from artemcm/FixupLinuxTestErrors
Remove non-fatal test error conditions in Linux testing
2 parents 22b3177 + 7bab494 commit a531c3d

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)
@@ -3005,7 +3003,7 @@ final class SwiftDriverTests: XCTestCase {
30053003

30063004
do {
30073005
// Calls using the driver to link a library shouldn't trigger an emit-module job, like in LLDB tests.
3008-
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"],
3006+
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"],
30093007
env: envVars)
30103008
let plannedJobs = try driver.planBuild()
30113009
XCTAssertEqual(plannedJobs.count, 1)
@@ -5550,7 +5548,8 @@ final class SwiftDriverTests: XCTestCase {
55505548
func testIndexFilePathHandling() throws {
55515549
do {
55525550
var driver = try Driver(args: ["swiftc", "-index-file", "-index-file-path",
5553-
"bar.swift", "foo.swift", "bar.swift", "baz.swift"])
5551+
"bar.swift", "foo.swift", "bar.swift", "baz.swift",
5552+
"-module-name", "Test"])
55545553
let plannedJobs = try driver.planBuild()
55555554
XCTAssertEqual(plannedJobs.count, 1)
55565555
XCTAssertEqual(plannedJobs[0].kind, .compile)

0 commit comments

Comments
 (0)