@@ -3628,7 +3628,8 @@ final class BuildPlanTests: XCTestCase {
3628
3628
let exe = try result. target ( for: " exe " ) . swiftTarget ( ) . compileArguments ( )
3629
3629
XCTAssertMatch ( exe, [
3630
3630
" -module-cache-path " , " \( buildPath. appending ( components: " ModuleCache " ) ) " ,
3631
- " -resource-dir " , " /fake/lib/swift " ,
3631
+ . anySequence,
3632
+ " -resource-dir " , " \( AbsolutePath ( " /fake/lib/swift " ) ) " ,
3632
3633
. anySequence,
3633
3634
" -swift-flag-from-json " ,
3634
3635
. anySequence,
@@ -3640,7 +3641,13 @@ final class BuildPlanTests: XCTestCase {
3640
3641
] )
3641
3642
3642
3643
let exeProduct = try result. buildProduct ( for: " exe " ) . linkArguments ( )
3643
- XCTAssertMatch ( exeProduct, [ . anySequence, " -resource-dir " , " /fake/lib/swift " , " -Xclang-linker " , " -resource-dir " , " -Xclang-linker " , " /fake/lib/swift/clang " , . anySequence] )
3644
+ XCTAssertMatch ( exeProduct, [
3645
+ . anySequence,
3646
+ " -resource-dir " , " \( AbsolutePath ( " /fake/lib/swift " ) ) " ,
3647
+ " -Xclang-linker " , " -resource-dir " ,
3648
+ " -Xclang-linker " , " \( AbsolutePath ( " /fake/lib/swift/clang " ) ) " ,
3649
+ . anySequence
3650
+ ] )
3644
3651
3645
3652
let staticBuildParameters = {
3646
3653
var copy = extraBuildParameters
@@ -3657,10 +3664,19 @@ final class BuildPlanTests: XCTestCase {
3657
3664
) )
3658
3665
3659
3666
let staticExe = try staticResult. target ( for: " exe " ) . swiftTarget ( ) . compileArguments ( )
3660
- XCTAssertMatch ( staticExe, [ . anySequence, " -resource-dir " , " /fake/lib/swift_static " , . anySequence] )
3667
+ XCTAssertMatch ( staticExe, [
3668
+ . anySequence,
3669
+ " -resource-dir " , " \( AbsolutePath ( " /fake/lib/swift_static " ) ) " ,
3670
+ . anySequence] )
3661
3671
3662
3672
let staticExeProduct = try staticResult. buildProduct ( for: " exe " ) . linkArguments ( )
3663
- XCTAssertMatch ( staticExeProduct, [ . anySequence, " -resource-dir " , " /fake/lib/swift_static " , " -Xclang-linker " , " -resource-dir " , " -Xclang-linker " , " /fake/lib/swift/clang " , . anySequence] )
3673
+ XCTAssertMatch ( staticExeProduct, [
3674
+ . anySequence,
3675
+ " -resource-dir " , " \( AbsolutePath ( " /fake/lib/swift_static " ) ) " ,
3676
+ " -Xclang-linker " , " -resource-dir " ,
3677
+ " -Xclang-linker " , " \( AbsolutePath ( " /fake/lib/swift/clang " ) ) " ,
3678
+ . anySequence
3679
+ ] )
3664
3680
}
3665
3681
3666
3682
func testUserToolchainWithToolsetCompileFlags( ) throws {
0 commit comments