Fix cache checking bug

Author: stevapple

Sources/ScriptingCore/utils.swift

@@ -47,7 +47,7 @@ public func resolveFilePath(_ path: String) -> AbsolutePath? {
         guard let cwd = localFileSystem.currentWorkingDirectory else {
             return nil
         }
-        absolutePath = AbsolutePath(cwd, path)
+        absolutePath = AbsolutePath(path, relativeTo: cwd)
     }
     guard localFileSystem.isFile(absolutePath) else {
         return nil
@@ -117,8 +117,9 @@ public func checkAndPerformCache(for file: String, at dirPath: AbsolutePath) thr
         return (productName, cacheDirPath)
     } else {
         // Check if the specified cache exists.
-        let cacheDirPath = dirPath.appending(component: file)
-        guard localFileSystem.isDirectory(cacheDirPath) else {
+        guard !file.contains("/"),
+              case let cacheDirPath = dirPath.appending(component: file),
+              localFileSystem.isDirectory(cacheDirPath) else {
             throw ScriptError.fileNotFound(file)
         }
         // Drop the hash suffix.

Tests/CommandsTests/ScriptToolTests.swift

@@ -49,7 +49,6 @@ final class ScriptToolTests: XCTestCase {
                 _ = try run(pathString)
                 XCTFail("Unexpected success")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTExpectFailure() // FIXME: Seems an implementation bug of TSC?
                 XCTAssertEqual(stderr, "error: \(pathString) doesn't exist\n")
             }
         }