Skip to content

Commit b75a4e6

Browse files
committed
Fix tests to match behaviour expected with newest toolchain
Newest toolchains contain the swift --> swift-frontend rename so a couple of tests needed fixing up.
1 parent c79be1c commit b75a4e6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Tests/SwiftDriverTests/JobExecutorTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ final class JobExecutorTests: XCTestCase {
192192

193193
func testSwiftDriverExecOverride() throws {
194194
var env = ProcessEnv.vars
195-
let envVarName = "SWIFT_DRIVER_SWIFT_EXEC"
195+
let envVarName = "SWIFT_DRIVER_SWIFT_FRONTEND_EXEC"
196196
let dummyPath = "/some/garbage/path/fnord"
197197
let executor = try SwiftDriverExecutor(diagnosticsEngine: DiagnosticsEngine(),
198198
processSet: ProcessSet(),
@@ -202,7 +202,7 @@ final class JobExecutorTests: XCTestCase {
202202
// DarwinToolchain
203203
env.removeValue(forKey: envVarName)
204204
let normalSwiftPath = try DarwinToolchain(env: env, executor: executor).getToolPath(.swiftCompiler)
205-
XCTAssertEqual(normalSwiftPath.basenameWithoutExt, "swift")
205+
XCTAssertEqual(normalSwiftPath.basenameWithoutExt, "swift-frontend")
206206

207207
env[envVarName] = dummyPath
208208
let overriddenSwiftPath = try DarwinToolchain(env: env, executor: executor).getToolPath(.swiftCompiler)
@@ -211,7 +211,7 @@ final class JobExecutorTests: XCTestCase {
211211
// GenericUnixToolchain
212212
env.removeValue(forKey: envVarName)
213213
let unixSwiftPath = try GenericUnixToolchain(env: env, executor: executor).getToolPath(.swiftCompiler)
214-
XCTAssertEqual(unixSwiftPath.basenameWithoutExt, "swift")
214+
XCTAssertEqual(unixSwiftPath.basenameWithoutExt, "swift-frontend")
215215

216216
env[envVarName] = dummyPath
217217
let unixOverriddenSwiftPath = try GenericUnixToolchain(env: env, executor: executor).getToolPath(.swiftCompiler)

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,19 +1584,19 @@ final class SwiftDriverTests: XCTestCase {
15841584
XCTAssertEqual(output,
15851585
"""
15861586
digraph Jobs {
1587-
"compile (swiftc)" [style=bold];
1587+
"compile (swift-frontend)" [style=bold];
15881588
"test.swift" [fontsize=12];
1589-
"test.swift" -> "compile (swiftc)" [color=blue];
1589+
"test.swift" -> "compile (swift-frontend)" [color=blue];
15901590
"test.o" [fontsize=12];
1591-
"compile (swiftc)" -> "test.o" [color=green];
1591+
"compile (swift-frontend)" -> "test.o" [color=green];
15921592
"test.swiftmodule" [fontsize=12];
1593-
"compile (swiftc)" -> "test.swiftmodule" [color=green];
1593+
"compile (swift-frontend)" -> "test.swiftmodule" [color=green];
15941594
"test.swiftdoc" [fontsize=12];
1595-
"compile (swiftc)" -> "test.swiftdoc" [color=green];
1596-
"mergeModule (swiftc)" [style=bold];
1597-
"test.swiftmodule" -> "mergeModule (swiftc)" [color=blue];
1598-
"mergeModule (swiftc)" -> "test.swiftmodule" [color=green];
1599-
"mergeModule (swiftc)" -> "test.swiftdoc" [color=green];
1595+
"compile (swift-frontend)" -> "test.swiftdoc" [color=green];
1596+
"mergeModule (swift-frontend)" [style=bold];
1597+
"test.swiftmodule" -> "mergeModule (swift-frontend)" [color=blue];
1598+
"mergeModule (swift-frontend)" -> "test.swiftmodule" [color=green];
1599+
"mergeModule (swift-frontend)" -> "test.swiftdoc" [color=green];
16001600
"link (\(dynamicLinker))" [style=bold];
16011601
"test.o" -> "link (\(dynamicLinker))" [color=blue];
16021602
"test" [fontsize=12];

0 commit comments

Comments
 (0)