@@ -1197,8 +1197,8 @@ final class SwiftDriverTests: XCTestCase {
11971197 let outputMapContents : ByteString = """
11981198 {
11991199 " " : {
1200- " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .dia " ,
1201- " emit-module-diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.dia "
1200+ " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .dia " ,
1201+ " emit-module-diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.dia "
12021202 },
12031203 " foo.swift " : {
12041204 " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.dia "
@@ -1216,7 +1216,7 @@ final class SwiftDriverTests: XCTestCase {
12161216 XCTAssertEqual ( plannedJobs [ 0 ] . kind, . emitModule)
12171217 XCTAssertEqual ( plannedJobs [ 1 ] . kind, . compile)
12181218 XCTAssertEqual ( plannedJobs [ 2 ] . kind, . link)
1219- try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.dia " ) ) ) )
1219+ try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.dia " ) ) ) )
12201220 try XCTAssertJobInvocationMatches ( plannedJobs [ 1 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.dia " ) ) ) )
12211221 }
12221222
@@ -1230,8 +1230,8 @@ final class SwiftDriverTests: XCTestCase {
12301230 XCTAssertEqual ( plannedJobs [ 0 ] . kind, . compile)
12311231 XCTAssertEqual ( plannedJobs [ 1 ] . kind, . emitModule)
12321232 XCTAssertEqual ( plannedJobs [ 2 ] . kind, . link)
1233- try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .dia " ) ) ) )
1234- try XCTAssertJobInvocationMatches ( plannedJobs [ 1 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.dia " ) ) ) )
1233+ try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .dia " ) ) ) )
1234+ try XCTAssertJobInvocationMatches ( plannedJobs [ 1 ] , . flag( " -serialize-diagnostics-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.dia " ) ) ) )
12351235 }
12361236 }
12371237 }
@@ -1241,8 +1241,8 @@ final class SwiftDriverTests: XCTestCase {
12411241 let outputMapContents : ByteString = """
12421242 {
12431243 " " : {
1244- " dependencies " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .d " ,
1245- " emit-module-dependencies " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.d "
1244+ " dependencies " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .d " ,
1245+ " emit-module-dependencies " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.d "
12461246 },
12471247 " foo.swift " : {
12481248 " dependencies " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.d "
@@ -1260,7 +1260,7 @@ final class SwiftDriverTests: XCTestCase {
12601260 XCTAssertEqual ( plannedJobs [ 0 ] . kind, . emitModule)
12611261 XCTAssertEqual ( plannedJobs [ 1 ] . kind, . compile)
12621262 XCTAssertEqual ( plannedJobs [ 2 ] . kind, . link)
1263- try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.d " ) ) ) )
1263+ try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.d " ) ) ) )
12641264 try XCTAssertJobInvocationMatches ( plannedJobs [ 1 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.d " ) ) ) )
12651265 }
12661266
@@ -1274,8 +1274,8 @@ final class SwiftDriverTests: XCTestCase {
12741274 XCTAssertEqual ( plannedJobs [ 0 ] . kind, . compile)
12751275 XCTAssertEqual ( plannedJobs [ 1 ] . kind, . emitModule)
12761276 XCTAssertEqual ( plannedJobs [ 2 ] . kind, . link)
1277- try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .d " ) ) ) )
1278- try XCTAssertJobInvocationMatches ( plannedJobs [ 1 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.d " ) ) ) )
1277+ try XCTAssertJobInvocationMatches ( plannedJobs [ 0 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .d " ) ) ) )
1278+ try XCTAssertJobInvocationMatches ( plannedJobs [ 1 ] , . flag( " -emit-dependencies-path " ) , . path( . absolute( . init( validating: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.d " ) ) ) )
12791279 }
12801280 }
12811281 }
@@ -1287,7 +1287,7 @@ final class SwiftDriverTests: XCTestCase {
12871287 let contents = ByteString ( """
12881288 {
12891289 " " : {
1290- " swift-dependencies " : " \( objroot. appending ( components: " master .swiftdeps" ) . nativePathString ( escaped: true ) ) "
1290+ " swift-dependencies " : " \( objroot. appending ( components: " main .swiftdeps" ) . nativePathString ( escaped: true ) ) "
12911291 },
12921292 " /tmp/foo/Sources/foo/foo.swift " : {
12931293 " dependencies " : " \( objroot. appending ( components: " foo.d " ) . nativePathString ( escaped: true ) ) " ,
@@ -1306,8 +1306,8 @@ final class SwiftDriverTests: XCTestCase {
13061306 let object = try outputFileMap. getOutput ( inputFile: VirtualPath . intern ( path: " /tmp/foo/Sources/foo/foo.swift " ) , outputType: . object)
13071307 XCTAssertEqual ( VirtualPath . lookup ( object) . name, objroot. appending ( components: " foo.swift.o " ) . pathString)
13081308
1309- let masterDeps = try outputFileMap. getOutput ( inputFile: VirtualPath . intern ( path: " " ) , outputType: . swiftDeps)
1310- XCTAssertEqual ( VirtualPath . lookup ( masterDeps ) . name, objroot. appending ( components: " master .swiftdeps" ) . pathString)
1309+ let mainDeps = try outputFileMap. getOutput ( inputFile: VirtualPath . intern ( path: " " ) , outputType: . swiftDeps)
1310+ XCTAssertEqual ( VirtualPath . lookup ( mainDeps ) . name, objroot. appending ( components: " main .swiftdeps" ) . pathString)
13111311 }
13121312 }
13131313 }
@@ -1320,7 +1320,7 @@ final class SwiftDriverTests: XCTestCase {
13201320 """
13211321 {
13221322 " " : {
1323- " swift-dependencies " : " \( objroot. appending ( components: " master .swiftdeps" ) . nativePathString ( escaped: true ) ) "
1323+ " swift-dependencies " : " \( objroot. appending ( components: " main .swiftdeps" ) . nativePathString ( escaped: true ) ) "
13241324 },
13251325 " /tmp/foo/Sources/foo/foo.swift " : {
13261326 " dependencies " : " \( objroot. appending ( components: " foo.d " ) . nativePathString ( escaped: true ) ) " ,
@@ -1351,7 +1351,7 @@ final class SwiftDriverTests: XCTestCase {
13511351 """
13521352 {
13531353 " " : {
1354- " swift-dependencies " : " \( objroot. appending ( components: " master .swiftdeps" ) . nativePathString ( escaped: true ) ) "
1354+ " swift-dependencies " : " \( objroot. appending ( components: " main .swiftdeps" ) . nativePathString ( escaped: true ) ) "
13551355 },
13561356 " /tmp/foo/Sources/foo/foo.swift " : {
13571357 " dependencies " : " \( objroot. appending ( components: " foo.d " ) . nativePathString ( escaped: true ) ) " ,
@@ -1643,7 +1643,7 @@ final class SwiftDriverTests: XCTestCase {
16431643 let outputMapContents : ByteString = """
16441644 {
16451645 " " : {
1646- " const-values " : " /tmp/foo.build/foo.master .swiftconstvalues "
1646+ " const-values " : " /tmp/foo.build/foo.main .swiftconstvalues "
16471647 },
16481648 " foo.swift " : {
16491649 " object " : " /tmp/foo.build/foo.swift.o " ,
@@ -1668,7 +1668,7 @@ final class SwiftDriverTests: XCTestCase {
16681668 XCTAssertEqual ( plannedJobs. count, 2 )
16691669 XCTAssertEqual ( plannedJobs [ 0 ] . kind, . compile)
16701670 XCTAssertEqual ( plannedJobs [ 0 ] . outputs. first ( where: { $0. type == . swiftConstValues } ) ? . file,
1671- . absolute( try . init( validating: " /tmp/foo.build/foo.master .swiftconstvalues " ) ) )
1671+ . absolute( try . init( validating: " /tmp/foo.build/foo.main .swiftconstvalues " ) ) )
16721672 XCTAssertEqual ( plannedJobs [ 1 ] . kind, . link)
16731673 }
16741674 }
@@ -1754,7 +1754,7 @@ final class SwiftDriverTests: XCTestCase {
17541754
17551755 // Rather than writing VirtualPath(path:...) over and over again, make strings, then fix it
17561756 let stringyEntries : [ String : [ FileType : String ] ] = [
1757- " " : [ . swiftDeps: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .swiftdeps " ] ,
1757+ " " : [ . swiftDeps: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .swiftdeps " ] ,
17581758 " foo.swift " : [
17591759 . dependencies: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.d " ,
17601760 . object: " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.swift.o " ,
@@ -1783,7 +1783,7 @@ final class SwiftDriverTests: XCTestCase {
17831783 // Create sample OutputFileMap:
17841784
17851785 let stringyEntries : [ String : [ FileType : String ] ] = [
1786- " " : [ . swiftDeps: " foo.build/master .swiftdeps " ] ,
1786+ " " : [ . swiftDeps: " foo.build/main .swiftdeps " ] ,
17871787 " foo.swift " : [
17881788 . dependencies: " foo.build/foo.d " ,
17891789 . object: " foo.build/foo.swift.o " ,
@@ -1795,7 +1795,7 @@ final class SwiftDriverTests: XCTestCase {
17951795 let root = localFileSystem. currentWorkingDirectory!. appending ( components: " foo_root " )
17961796
17971797 let resolvedStringyEntries : [ String : [ FileType : String ] ] = [
1798- " " : [ . swiftDeps: root. appending ( components: " foo.build " , " master .swiftdeps" ) . pathString] ,
1798+ " " : [ . swiftDeps: root. appending ( components: " foo.build " , " main .swiftdeps" ) . pathString] ,
17991799 root. appending ( component: " foo.swift " ) . pathString : [
18001800 . dependencies: root. appending ( components: " foo.build " , " foo.d " ) . pathString,
18011801 . object: root. appending ( components: " foo.build " , " foo.swift.o " ) . pathString,
@@ -1833,7 +1833,7 @@ final class SwiftDriverTests: XCTestCase {
18331833 """
18341834 {
18351835 " " : {
1836- " swift-dependencies " : " build/master .swiftdeps "
1836+ " swift-dependencies " : " build/main .swiftdeps "
18371837 },
18381838 " main.swift " : {
18391839 " object " : " build/main.o " ,
@@ -7571,8 +7571,8 @@ final class SwiftDriverTests: XCTestCase {
75717571 let outputMapContents : ByteString = """
75727572 {
75737573 " " : {
7574- " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .dia " ,
7575- " emit-module-diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.dia "
7574+ " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .dia " ,
7575+ " emit-module-diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.dia "
75767576 },
75777577 " foo.swift " : {
75787578 " object " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.o "
@@ -7596,8 +7596,8 @@ final class SwiftDriverTests: XCTestCase {
75967596 let outputMapContents : ByteString = . init( encodingAsUTF8: """
75977597 {
75987598 " " : {
7599- " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .dia " ,
7600- " emit-module-diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master .emit-module.dia "
7599+ " diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .dia " ,
7600+ " emit-module-diagnostics " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/main .emit-module.dia "
76017601 },
76027602 " \( try AbsolutePath ( validating: " /some/workingdir/foo.swift " ) . nativePathString ( escaped: true ) ) " : {
76037603 " object " : " /tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.o "
0 commit comments