Skip to content

utils: port round-trip-syntax-test to windows #21884

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.

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
Jan 17, 2019

Conversation

compnerd
Copy link
Member

Use python's builtin diff rather than invoking /usr/bin/diff which
does not exist on Windows. Decode the content into UTF-8 before
processing it for the diff as the file reading will give us UTF-16
content on Windows.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

CC: @bitjammer

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 2ad01f67d08039a2802f09fdafdb0b5da1f46cbb

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 2ad01f67d08039a2802f09fdafdb0b5da1f46cbb

Use python's builtin diff rather than invoking `/usr/bin/diff` which
does not exist on Windows.  Decode the content into UTF-8 before
processing it for the diff as the file reading will give us UTF-16
content on Windows.
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 7d07ae4

@compnerd
Copy link
Member Author

@swift-ci please test macOS platform

@compnerd compnerd merged commit 230bee4 into swiftlang:master Jan 17, 2019
@compnerd compnerd deleted the round-trip-flight branch January 17, 2019 17:28
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