Merge remote-tracking branch 'origin/main' into release/5.10

swift-ci · swift-ci · commit 4491901ac3f1 · 2023-10-08T11:15:45.000-07:00
diff --git a/Tests/PackageLoadingTests/PkgConfigAllowlistTests.swift b/Tests/PackageLoadingTests/PkgConfigAllowlistTests.swift
@@ -46,8 +46,8 @@ final class PkgConfigAllowlistTests: XCTestCase {
 
     func testPathSDKPaths() throws {
         let flags = ["-I/opt/homebrew/Cellar/cairo/1.16.0_5/include/cairo", "-I/Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk/usr/include/ffi"]
-        let sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk"
-        let result = try patchSDKPaths(in: flags, to: AbsolutePath(sdk))
+        let sdk = AbsolutePath("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk")
+        let result = try patchSDKPaths(in: flags, to: sdk)
 
         XCTAssertEqual(result, ["-I/opt/homebrew/Cellar/cairo/1.16.0_5/include/cairo", "-I\(sdk)/usr/include/ffi"])
     }

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ final class PkgConfigAllowlistTests: XCTestCase {`
`46`	`46`
`47`	`47`	`func testPathSDKPaths() throws {`
`48`	`48`	`let flags = ["-I/opt/homebrew/Cellar/cairo/1.16.0_5/include/cairo", "-I/Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk/usr/include/ffi"]`
`49`		`- let sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk"`
`50`		`- let result = try patchSDKPaths(in: flags, to: AbsolutePath(sdk))`
	`49`	`+ let sdk = AbsolutePath("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk")`
	`50`	`+ let result = try patchSDKPaths(in: flags, to: sdk)`
`51`	`51`
`52`	`52`	`XCTAssertEqual(result, ["-I/opt/homebrew/Cellar/cairo/1.16.0_5/include/cairo", "-I\(sdk)/usr/include/ffi"])`
`53`	`53`	`}`