Merge pull request #2666 from aciidb0mb3r/fix-tmpdir-bug

[TSCBasic] Don't delete empty tmpdir

Author: aciidgh

swift-tools-support-core/Sources/TSCBasic/TemporaryFile.swift

@@ -217,12 +217,7 @@ public func withTemporaryDirectory<Result>(
     let path = AbsolutePath(String(cString: template))
 
     defer {
-        let isEmptyDirectory: (String) -> Bool = { path in
-            guard let contents = try? FileManager.default.contentsOfDirectory(atPath: path) else { return false }
-            return contents.isEmpty
-        }
-
-        if removeTreeOnDeinit || isEmptyDirectory(path.pathString) {
+        if removeTreeOnDeinit {
             _ = try? FileManager.default.removeItem(atPath: path.pathString)
         }
     }

swift-tools-support-core/Tests/TSCBasicTests/TemporaryFileTests.swift

@@ -93,7 +93,7 @@ class TemporaryFileTests: XCTestCase {
 
     func testBasicTemporaryDirectory() throws {
         // Test can create and remove temp directory.
-        let path1: AbsolutePath = try withTemporaryDirectory { tempDirPath in
+        let path1: AbsolutePath = try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
             XCTAssertTrue(localFileSystem.isDirectory(tempDirPath))
             return tempDirPath
         }
@@ -123,8 +123,8 @@ class TemporaryFileTests: XCTestCase {
     }
 
     func testCanCreateUniqueTempDirectories() throws {
-        let (pathOne, pathTwo): (AbsolutePath, AbsolutePath) = try withTemporaryDirectory { pathOne in
-            let pathTwo: AbsolutePath = try withTemporaryDirectory { pathTwo in
+        let (pathOne, pathTwo): (AbsolutePath, AbsolutePath) = try withTemporaryDirectory(removeTreeOnDeinit: true) { pathOne in
+            let pathTwo: AbsolutePath = try withTemporaryDirectory(removeTreeOnDeinit: true) { pathTwo in
                 XCTAssertTrue(localFileSystem.isDirectory(pathOne))
                 XCTAssertTrue(localFileSystem.isDirectory(pathTwo))
                 // Their paths should be different.