pass more tests swiftlang#2

Author: bkhouri

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -10820,8 +10820,9 @@ final class WorkspaceTests: XCTestCase {
 
             try await workspace.checkPackageGraph(roots: ["Root"]) { _, diagnostics in
                 testDiagnostics(diagnostics) { result in
+                    let tmpDirCanonicalPackageLocation = CanonicalPackageLocation(tmpDir.pathString)
                     result.check(
-                        diagnostic: "Conflicting identity for utility: dependency '\(tmpDir)/pkgs/other/utility' and dependency '\(tmpDir)/pkgs/foo/utility' both point to the same package identity 'utility'. The dependencies are introduced through the following chains: (A) \(tmpDir)/roots/root->\(tmpDir)/pkgs/bar->\(tmpDir)/pkgs/other/utility (B) \(tmpDir)/roots/root->\(tmpDir)/pkgs/foo/utility. If there are multiple chains that lead to the same dependency, only the first chain is shown here. To see all chains use debug output option. To resolve the conflict, coordinate with the maintainer of the package that introduces the conflicting dependency.",
+                        diagnostic: "Conflicting identity for utility: dependency '\(tmpDirCanonicalPackageLocation)/pkgs/other/utility' and dependency '\(tmpDirCanonicalPackageLocation)/pkgs/foo/utility' both point to the same package identity 'utility'. The dependencies are introduced through the following chains: (A) \(tmpDirCanonicalPackageLocation)/roots/root->\(tmpDirCanonicalPackageLocation)/pkgs/bar->\(tmpDirCanonicalPackageLocation)/pkgs/other/utility (B) \(tmpDirCanonicalPackageLocation)/roots/root->\(tmpDirCanonicalPackageLocation)/pkgs/foo/utility. If there are multiple chains that lead to the same dependency, only the first chain is shown here. To see all chains use debug output option. To resolve the conflict, coordinate with the maintainer of the package that introduces the conflicting dependency.",
                         severity: .error
                     )
                 }
@@ -11163,8 +11164,9 @@ final class WorkspaceTests: XCTestCase {
             // we will escalate this to an error in a few versions to tighten up the validation
             try await workspace.checkPackageGraph(roots: ["Root"]) { _, diagnostics in
                 testDiagnostics(diagnostics) { result in
+                    let tmpDirCanonicalPackageLocation = CanonicalPackageLocation(tmpDir.pathString)
                     result.check(
-                        diagnostic: "Conflicting identity for utility: dependency '\(tmpDir)/pkgs/other-foo/utility' and dependency '\(tmpDir)/pkgs/foo/utility' both point to the same package identity 'utility'. The dependencies are introduced through the following chains: (A) \(tmpDir)/roots/root->\(tmpDir)/pkgs/bar->\(tmpDir)/pkgs/other-foo/utility (B) \(tmpDir)/roots/root->\(tmpDir)/pkgs/foo/utility. If there are multiple chains that lead to the same dependency, only the first chain is shown here. To see all chains use debug output option. To resolve the conflict, coordinate with the maintainer of the package that introduces the conflicting dependency. This will be escalated to an error in future versions of SwiftPM.",
+                        diagnostic: "Conflicting identity for utility: dependency '\(tmpDirCanonicalPackageLocation)/pkgs/other-foo/utility' and dependency '\(tmpDirCanonicalPackageLocation)/pkgs/foo/utility' both point to the same package identity 'utility'. The dependencies are introduced through the following chains: (A) \(tmpDirCanonicalPackageLocation)/roots/root->\(tmpDirCanonicalPackageLocation)/pkgs/bar->\(tmpDirCanonicalPackageLocation)/pkgs/other-foo/utility (B) \(tmpDirCanonicalPackageLocation)/roots/root->\(tmpDirCanonicalPackageLocation)/pkgs/foo/utility. If there are multiple chains that lead to the same dependency, only the first chain is shown here. To see all chains use debug output option. To resolve the conflict, coordinate with the maintainer of the package that introduces the conflicting dependency. This will be escalated to an error in future versions of SwiftPM.",
                         severity: .warning
                     )
                     // FIXME: rdar://72940946
@@ -11567,8 +11569,9 @@ final class WorkspaceTests: XCTestCase {
             // we will escalate this to an error in a few versions to tighten up the validation
             try await workspace.checkPackageGraph(roots: ["Root"]) { _, diagnostics in
                 testDiagnostics(diagnostics) { result in
+                    let tmpDirCanonicalPackageLocation = CanonicalPackageLocation(tmpDir.pathString)
                     result.check(
-                        diagnostic: "Conflicting identity for foo: dependency 'github.com/foo-moved/foo' and dependency 'github.com/foo/foo' both point to the same package identity 'foo'. The dependencies are introduced through the following chains: (A) \(tmpDir)/roots/root->\(tmpDir)/pkgs/bar->github.com/foo-moved/foo (B) \(tmpDir)/roots/root->github.com/foo/foo. If there are multiple chains that lead to the same dependency, only the first chain is shown here. To see all chains use debug output option. To resolve the conflict, coordinate with the maintainer of the package that introduces the conflicting dependency. This will be escalated to an error in future versions of SwiftPM.",
+                        diagnostic: "Conflicting identity for foo: dependency 'github.com/foo-moved/foo' and dependency 'github.com/foo/foo' both point to the same package identity 'foo'. The dependencies are introduced through the following chains: (A) \(tmpDirCanonicalPackageLocation)/roots/root->\(tmpDirCanonicalPackageLocation)/pkgs/bar->github.com/foo-moved/foo (B) \(tmpDirCanonicalPackageLocation)/roots/root->github.com/foo/foo. If there are multiple chains that lead to the same dependency, only the first chain is shown here. To see all chains use debug output option. To resolve the conflict, coordinate with the maintainer of the package that introduces the conflicting dependency. This will be escalated to an error in future versions of SwiftPM.",
                         severity: .warning
                     )
                 }
@@ -14750,7 +14753,7 @@ final class WorkspaceTests: XCTestCase {
                         let tmpDirCanonicalPackageLocation = CanonicalPackageLocation(tmpDir.pathString)
                         result.check(
                             diagnostic: .contains("""
-                            dependency 'git/org/baz' and dependency 'org.baz' both point to the same package identity 'org.baz'. The dependencies are introduced through the following chains: (A) \(tmpDirCanonicalPackageLocation)/roots/root->org.foo->git/org/baz (B) \(tmpDir)/roots/root->org.bar->org.baz.
+                            dependency 'git/org/baz' and dependency 'org.baz' both point to the same package identity 'org.baz'. The dependencies are introduced through the following chains: (A) \(tmpDirCanonicalPackageLocation)/roots/root->org.foo->git/org/baz (B) \(tmpDirCanonicalPackageLocation)/roots/root->org.bar->org.baz.
                             """),
                             severity: .warning
                         )