Minor fixes

Author: grynspan

Sources/Overlays/_Testing_Foundation/Attachments/Test.Attachment+URL.swift

@@ -19,10 +19,9 @@ extension URL {
 #if os(Windows)
     // BUG: `path` includes a leading slash which makes it invalid on Windows.
     // SEE: https://github.com/swiftlang/swift-foundation/pull/964
-    let utf8 = path.utf8
-    let array = Array(utf8)
-    if array.count > 4, array[0] == UInt8(ascii: "/"), Character(UnicodeScalar(array[1])).isLetter, array[2] == UInt8(ascii: ":"), array[3] == UInt8(ascii: "/") {
-      return String(Substring(utf8.dropFirst()))
+    let path = path
+    if path.starts(with: /\/[A-Za-z]:\//) {
+      return String(path.dropFirst())
     }
 #endif
     return path
@@ -118,12 +117,15 @@ private struct _DirectoryContentAttachableProxy: Test.Attachable {
 #endif
     let sourcePath = url.fileSystemPath
     let destinationPath = temporaryURL.fileSystemPath
+    defer {
+      remove(destinationPath)
+    }
 
     try await withCheckedThrowingContinuation { continuation in
       do {
         _ = try Process.run(
           URL(fileURLWithPath: tarPath, isDirectory: false),
-          arguments: ["--create", "--gzip", "--file", destinationPath, sourcePath]
+          arguments: ["--create", "--gzip", "--directory", sourcePath, "--file", destinationPath, "."]
         ) { process in
           let terminationReason = process.terminationReason
           let terminationStatus = process.terminationStatus

Sources/Testing/Running/Configuration.swift

@@ -8,8 +8,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
-private import _TestingInternals
-
 /// A type containing settings for preparing and running tests.
 @_spi(ForToolsIntegrationOnly)
 public struct Configuration: Sendable {

Tests/TestingTests/AttachmentTests.swift

@@ -262,19 +262,22 @@ struct AttachmentTests {
 
 #if !SWT_NO_PROCESS_SPAWNING
   @Test func attachContentsOfDirectoryURL() async throws {
-    let temporaryFileName = UUID().uuidString
-    let temporaryPath = try appendPathComponent(temporaryFileName, to: temporaryDirectory())
+    let temporaryDirectoryName = UUID().uuidString
+    let temporaryPath = try appendPathComponent(temporaryDirectoryName, to: temporaryDirectory())
     let temporaryURL = URL(fileURLWithPath: temporaryPath, isDirectory: false)
     try FileManager.default.createDirectory(at: temporaryURL, withIntermediateDirectories: true)
 
+    let fileData = try #require("Hello world".data(using: .utf8))
+    try fileData.write(to: temporaryURL.appendingPathComponent("loremipsum.txt"), options: [.atomic])
+
     await confirmation("Attachment detected") { valueAttached in
       var configuration = Configuration()
       configuration.eventHandler = { event, _ in
         guard case let .valueAttached(attachment) = event.kind else {
           return
         }
 
-        #expect(attachment.preferredName == "\(temporaryFileName).tar.gz")
+        #expect(attachment.preferredName == "\(temporaryDirectoryName).tar.gz")
         valueAttached()
       }