[test] diff --strip-trailing-cr is non-standard. #33931
Merged
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
|
cc @compnerd: since this affects Windows line endings, could you do a CI run for this for me? |
|
This increases the FS traffic which is noticeable on Windows, so this is going to also slow down running tests. What do you think of hoisting the SourceKit |
3405691582
force-pushed
the
SedThenDiff
branch
from
7ebea3b to
1910ab7
Compare
This flag is a GNU extension, and would cause misleading test failures on other platforms where this extension is not available. However, the necessity to switch line endings is only required on Windows when testing. We could use sed to canonicalize line endings before comparing, but that may cause higher amounts of filesystem traffic on Windows which would slow down testing. Instead, move the substitution for diff in SourceKit's lit.local.cfg up to the top level, and conditionalize the substitution which has the flag on Windows, but not on other platforms (where it should not be required).
3405691582
force-pushed
the
SedThenDiff
branch
from
1910ab7 to
88167e7
Compare
|
Yeah, that's a nice idea. Done. (I made the necessary move of the substitution but could not check if the SourceKit tests function properly locally.) |
|
@swift-ci please test |
|
Build failed |
compnerd
approved these changes
Sep 14, 2020
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.
Since we're saving command output to file and then comparing, we can use
sed to convert the inputs to the same line ending convention when
comparing. This has the same effect as the --strip-trailing-cr flag.
Since this flag is a nonstandard extension, it won't be available on
other platforms, and the absence of this flag will cause misleading test
failures.