Skip to content

Remove a workaround for a URL.path bug on Windows. #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2025
Merged

Remove a workaround for a URL.path bug on Windows. #1263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions Sources/Overlays/_Testing_Foundation/Attachments/Attachment+URL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,6 @@ private import WinSDK
#endif

#if !SWT_NO_FILE_IO
extension URL {
/// The file system path of the URL, equivalent to `path`.
var fileSystemPath: String {
#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 path = path
if path.starts(with: /\/[A-Za-z]:\//) {
return String(path.dropFirst())
}
#endif
return path
}
}

extension Attachment where AttachableValue == _AttachableURLWrapper {
#if SWT_TARGET_OS_APPLE
/// An operation queue to use for asynchronously reading data from disk.
Expand Down Expand Up @@ -203,8 +188,8 @@ private func _compressContentsOfDirectory(at directoryURL: URL) async throws ->
throw CocoaError(.featureUnsupported, userInfo: [NSLocalizedDescriptionKey: "This platform does not support attaching directories to tests."])
#endif

let sourcePath = directoryURL.fileSystemPath
let destinationPath = temporaryURL.fileSystemPath
let sourcePath = directoryURL.path
let destinationPath = temporaryURL.path
let arguments = {
#if os(Linux) || os(OpenBSD)
// The zip command constructs relative paths from the current working
Expand Down