Windows test accomodations #23011
Merged
Windows test accomodations #23011
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Windows uses carriage returns and newlines. The string matching is sensitive to this. Simply erase carriage returns from the standard error stream to compensate.
The path separator is different on Windows. Match just the last path component to allow the test to be portable.
|
CC: @moiseev |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test Linux platform |
|
Build failed |
|
@swift-ci please test Linux platform |
lorentey
approved these changes
Mar 1, 2019
| while let line = self._childStderr.getline() { | ||
| while var line = self._childStderr.getline() { | ||
| if let cr = line.firstIndex(of: "\r") { | ||
| line.remove(at: cr) |
There was a problem hiding this comment.
Hm, we should stop adding more workarounds for getline(), and fix its behavior instead. Is there anything that depends on getline() splitting on LF only?
There was a problem hiding this comment.
Yeah, that would be great to fix, I just have not been able to do that properly for some reason. Its not the splitting on LF that things are dependent on, its the string matching not expecting the CR to be there that causes the problems.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.