Skip to content

[Windows] Fix NSURL.relativePath #2847

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

Jump to bottom
Merged
merged 1 commit into from
Aug 5, 2020
Merged

[Windows] Fix NSURL.relativePath #2847

merged 1 commit into from
Aug 5, 2020
+30 −1

Conversation

lxbndr
Copy link
Contributor

@lxbndr lxbndr commented Aug 1, 2020

The path property of NSURL contains important code for handling absolute paths with drive letters.

This adds similar handling to relativePath. Otherwise URLs like C:\Some\Path would report invalid relative path starting with /C:.

@lxbndr
Copy link
Contributor Author

lxbndr commented Aug 1, 2020

cc @compnerd

@compnerd
Copy link
Member

compnerd commented Aug 5, 2020

@swift-ci please test

@lxbndr
Copy link
Contributor Author

lxbndr commented Aug 5, 2020 

/Users/buildnode/jenkins/workspace/swift-corelibs-foundation-PR-macOS/branch-master/swiftpm/Tests/FunctionalTests/MiscellaneousTests.swift:230: error: -[FunctionalTests.MiscellaneousTestCase testSwiftTestParallel] : XCTAssertTrue failed
21:11:26 /Users/buildnode/jenkins/workspace/swift-corelibs-foundation-PR-macOS/branch-master/swiftpm/Tests/FunctionalTests/MiscellaneousTests.swift:231: error: -[FunctionalTests.MiscellaneousTestCase testSwiftTestParallel] : XCTAssertTrue failed
21:11:26 /Users/buildnode/jenkins/workspace/swift-corelibs-foundation-PR-macOS/branch-master/swiftpm/Tests/FunctionalTests/MiscellaneousTests.swift:233: error: -[FunctionalTests.MiscellaneousTestCase testSwiftTestParallel] : XCTAssertTrue failed
21:11:26 /Users/buildnode/jenkins/workspace/swift-corelibs-foundation-PR-macOS/branch-master/swiftpm/Tests/FunctionalTests/MiscellaneousTests.swift:234: error: -[FunctionalTests.MiscellaneousTestCase testSwiftTestParallel] : XCTAssertTrue failed
21:11:26 Test Case '-[FunctionalTests.MiscellaneousTestCase testSwiftTestParallel]' failed (34.217 seconds).

Looks unrelated. Or is it?

@compnerd
Copy link
Member

compnerd commented Aug 5, 2020

@swift-ci please test macOS platform

@compnerd compnerd merged commit eeb3262 into swiftlang:master Aug 5, 2020
@lxbndr lxbndr deleted the win-url-relative-path branch August 5, 2020 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lxbndr @compnerd