@@ -23,7 +23,6 @@ import TSCBasic
23
23
import XCTest
24
24
25
25
import struct TSCUtility. BuildFlags
26
- import struct TSCUtility. Triple
27
26
28
27
final class SwiftPMWorkspaceTests : XCTestCase {
29
28
@@ -108,7 +107,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
108
107
109
108
let aswift = packageRoot. appending ( components: " Sources " , " lib " , " a.swift " )
110
109
let hostTriple = ws. buildParameters. triple
111
- let build = buildPath ( root: packageRoot, triple : hostTriple)
110
+ let build = buildPath ( root: packageRoot, platform : hostTriple. platformBuildPathComponent ( ) )
112
111
113
112
XCTAssertEqual ( ws. buildPath, build)
114
113
XCTAssertNotNil ( ws. indexStorePath)
@@ -164,7 +163,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
164
163
165
164
let aswift = packageRoot. appending ( components: " Sources " , " lib " , " a.swift " )
166
165
let hostTriple = ws. buildParameters. triple
167
- let build = buildPath ( root: packageRoot, config: config, triple : hostTriple)
166
+ let build = buildPath ( root: packageRoot, config: config, platform : hostTriple. platformBuildPathComponent ( ) )
168
167
169
168
XCTAssertEqual ( ws. buildPath, build)
170
169
let arguments = try ws. _settings ( for: aswift. asURI, . swift) !. compilerArguments
@@ -351,7 +350,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
351
350
let acxx = packageRoot. appending ( components: " Sources " , " lib " , " a.cpp " )
352
351
let bcxx = packageRoot. appending ( components: " Sources " , " lib " , " b.cpp " )
353
352
let hostTriple = ws. buildParameters. triple
354
- let build = buildPath ( root: packageRoot, triple : hostTriple)
353
+ let build = buildPath ( root: packageRoot, platform : hostTriple. platformBuildPathComponent ( ) )
355
354
356
355
XCTAssertEqual ( ws. buildPath, build)
357
356
XCTAssertNotNil ( ws. indexStorePath)
@@ -628,8 +627,8 @@ private func check(
628
627
private func buildPath(
629
628
root: AbsolutePath ,
630
629
config: BuildSetup = TestSourceKitServer . serverOptions. buildSetup,
631
- triple : Triple ) -> AbsolutePath
630
+ platform : String ) -> AbsolutePath
632
631
{
633
632
let buildPath = config. path ?? root. appending ( component: " .build " )
634
- return buildPath. appending ( components: triple . platformBuildPathComponent ( ) , " \( config. configuration) " )
633
+ return buildPath. appending ( components: platform , " \( config. configuration) " )
635
634
}
0 commit comments