IntegrationTests: fix AbsolutePath deprecation warnings (#6106)

For some reason these warnings were printed only in certain conditions, which may explain why these calls to a deprecated initializer of `AbsolutePath` persisted in the codebase for so long.

Author: MaxDesiatov

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

@@ -28,7 +28,7 @@ final class BasicTests: XCTestCase {
             XCTAssertMatch(build1Output, .contains("Build complete"))
 
             // Verify that the app works.
-            let dealerOutput = try sh(AbsolutePath(".build/debug/dealer", relativeTo: packagePath), "10").stdout
+            let dealerOutput = try sh(AbsolutePath(validating: ".build/debug/dealer", relativeTo: packagePath), "10").stdout
             XCTAssertEqual(dealerOutput.filter(\.isPlayingCardSuit).count, 10)
 
             // Verify that the 'git status' is clean after a build.

IntegrationTests/Tests/IntegrationTests/Helpers.swift

@@ -17,12 +17,12 @@ import enum TSCUtility.Git
 
 let sdkRoot: AbsolutePath? = {
     if let environmentPath = ProcessInfo.processInfo.environment["SDK_ROOT"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
   #if os(macOS)
     let result = try! Process.popen(arguments: ["xcrun", "--sdk", "macosx", "--show-sdk-path"])
-    let sdkRoot = try! AbsolutePath(result.utf8Output().spm_chomp())
+    let sdkRoot = try! AbsolutePath(validating: result.utf8Output().spm_chomp())
     return sdkRoot
   #else
     return nil
@@ -31,21 +31,21 @@ let sdkRoot: AbsolutePath? = {
 
 let toolchainPath: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["TOOLCHAIN_PATH"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
   #if os(macOS)
-    let swiftcPath = try! AbsolutePath(sh("xcrun", "--find", "swift").stdout.spm_chomp())
+    let swiftcPath = try! AbsolutePath(validating: sh("xcrun", "--find", "swift").stdout.spm_chomp())
   #else
-    let swiftcPath = try! AbsolutePath(sh("which", "swift").stdout.spm_chomp())
+    let swiftcPath = try! AbsolutePath(validating: sh("which", "swift").stdout.spm_chomp())
   #endif
     let toolchainPath = swiftcPath.parentDirectory.parentDirectory.parentDirectory
     return toolchainPath
 }()
 
 let clang: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["CLANG_PATH"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
     let clangPath = toolchainPath.appending(components: "usr", "bin", "clang")
@@ -54,7 +54,7 @@ let clang: AbsolutePath = {
 
 let xcodebuild: AbsolutePath = {
     #if os(macOS)
-      let xcodebuildPath = try! AbsolutePath(sh("xcrun", "--find", "xcodebuild").stdout.spm_chomp())
+      let xcodebuildPath = try! AbsolutePath(validating: sh("xcrun", "--find", "xcodebuild").stdout.spm_chomp())
       return xcodebuildPath
     #else
       fatalError("should not be used on other platforms than macOS")
@@ -63,7 +63,7 @@ let xcodebuild: AbsolutePath = {
 
 let swift: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["SWIFT_PATH"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
     let swiftPath = toolchainPath.appending(components: "usr", "bin", "swift")
@@ -72,7 +72,7 @@ let swift: AbsolutePath = {
 
 let swiftc: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["SWIFTC_PATH"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
     let swiftcPath = toolchainPath.appending(components: "usr", "bin", "swiftc")
@@ -81,7 +81,7 @@ let swiftc: AbsolutePath = {
 
 let lldb: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["LLDB_PATH"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
     // We check if it exists because lldb doesn't exist in Xcode's default toolchain.
@@ -91,7 +91,7 @@ let lldb: AbsolutePath = {
     }
 
   #if os(macOS)
-    let lldbPath = try! AbsolutePath(sh("xcrun", "--find", "lldb").stdout.spm_chomp())
+    let lldbPath = try! AbsolutePath(validating: sh("xcrun", "--find", "lldb").stdout.spm_chomp())
     return lldbPath
   #else
     fatalError("LLDB_PATH environment variable required")
@@ -100,7 +100,7 @@ let lldb: AbsolutePath = {
 
 let swiftpmBinaryDirectory: AbsolutePath = {
     if let environmentPath = ProcessInfo.processInfo.environment["SWIFTPM_BIN_DIR"] {
-        return AbsolutePath(environmentPath)
+        return try! AbsolutePath(validating: environmentPath)
     }
 
     return swift.parentDirectory
@@ -209,7 +209,10 @@ func fixture(
 
             // Construct the expected path of the fixture.
             // FIXME: This seems quite hacky; we should provide some control over where fixtures are found.
-            let fixtureDir = AbsolutePath("../../../Fixtures/\(name)", relativeTo: AbsolutePath(#file))
+            let fixtureDir = try AbsolutePath(
+                validating: "../../../Fixtures/\(name)",
+                relativeTo: AbsolutePath(validating: #file)
+            )
 
             // Check that the fixture is really there.
             guard localFileSystem.isDirectory(fixtureDir) else {
@@ -317,7 +320,10 @@ func binaryTargetsFixture(_ closure: (AbsolutePath) throws -> Void) throws {
             let subpath = inputsPath.appending(component: "SwiftFramework")
             let projectPath = subpath.appending(component: "SwiftFramework.xcodeproj")
             try sh(xcodebuild, "-project", projectPath, "-scheme", "SwiftFramework", "-derivedDataPath", tmpDir, "COMPILER_INDEX_STORE_ENABLE=NO")
-            let frameworkPath = AbsolutePath("Build/Products/Debug/SwiftFramework.framework", relativeTo: tmpDir)
+            let frameworkPath = try AbsolutePath(
+                validating: "Build/Products/Debug/SwiftFramework.framework",
+                relativeTo: tmpDir
+            )
             let xcframeworkPath = packagePath.appending(component: "SwiftFramework.xcframework")
             try sh(xcodebuild, "-create-xcframework", "-framework", frameworkPath, "-output", xcframeworkPath)
         }

IntegrationTests/Tests/IntegrationTests/SwiftPMTests.swift

@@ -62,24 +62,30 @@ final class SwiftPMTests: XCTestCase {
             for entry in try localFileSystem.getDirectoryContents(packagePath.appending(components: "Sources", "foo")) {
                 try localFileSystem.removeFileTree(packagePath.appending(components: "Sources", "foo", entry))
             }
-            try localFileSystem.writeFileContents(AbsolutePath("Sources/foo/main.m", relativeTo: packagePath)) {
+            try localFileSystem.writeFileContents(AbsolutePath(validating: "Sources/foo/main.m", relativeTo: packagePath)) {
                 $0 <<< "int main() {}"
             }
             let archs = ["x86_64", "arm64"]
 
             for arch in archs {
                 try sh(swiftBuild, "--package-path", packagePath, "--arch", arch)
-                let fooPath = AbsolutePath(".build/\(arch)-apple-macosx/debug/foo", relativeTo: packagePath)
+                let fooPath = try AbsolutePath(
+                    validating: ".build/\(arch)-apple-macosx/debug/foo",
+                    relativeTo: packagePath
+                )
                 XCTAssertFileExists(fooPath)
             }
 
             let args = [swiftBuild.pathString, "--package-path", packagePath.pathString] + archs.flatMap{ ["--arch", $0] }
             try _sh(args)
 
-            let fooPath = AbsolutePath(".build/apple/Products/Debug/foo", relativeTo: packagePath)
+            let fooPath = try AbsolutePath(validating: ".build/apple/Products/Debug/foo", relativeTo: packagePath)
             XCTAssertFileExists(fooPath)
 
-            let objectsDir = AbsolutePath(".build/apple/Intermediates.noindex/foo.build/Debug/foo.build/Objects-normal", relativeTo: packagePath)
+            let objectsDir = try AbsolutePath(
+                validating: ".build/apple/Intermediates.noindex/foo.build/Debug/foo.build/Objects-normal",
+                relativeTo: packagePath
+            )
             for arch in archs {
                 XCTAssertDirectoryExists(objectsDir.appending(component: arch))
             }