Skip to content

Conversation

@davidungar
Copy link
Contributor

@davidungar davidungar commented Dec 3, 2020

Allow build record to reside at a relative path on the way to making legacy lit tests work.
rdar://71869992

@davidungar
Copy link
Contributor Author

@swift-ci please test

@davidungar davidungar requested a review from artemcm December 3, 2020 22:28
@davidungar
Copy link
Contributor Author

Part of rdar://71869992 (Swift Driver must handle relative paths in build records and other places in order to support legacy Driver/Dependencies tests)

}
}

extension VirtualPath {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have:

extension VirtualPath {
  fileprivate func resolvedRelativePath(base: AbsolutePath) -> VirtualPath {
    guard case let .relative(relPath) = self else { return self }
    return .absolute(.init(base, relPath))
  }
}

In OutputFileMap.swift. Should we common these two out?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this! Will do!!

@davidungar
Copy link
Contributor Author

@swift-ci please test

@davidungar davidungar merged commit 8101d69 into swiftlang:main Dec 3, 2020
@davidungar davidungar deleted the allow-for-build-record-to-have-relative-path branch December 4, 2020 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants