Tests: make them pass with CRLF checkouts #1422
Merged
Conversation
This file contains 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
|
@MarcelRaad, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bagder, @dfandrich and @yangtse to be potential reviewers. |
bagder
approved these changes
Apr 16, 2017
Bash on Linux errors out on CR characters. This makes tests 1221 and 1222 pass on Linux with a CRLF checkout. Ref: curl#1344 (comment) Closes curl#1422
Ignore everything after the version numbers in LIBCURL_VERSION and LIBCURL_VERSION_NUM to ged rid of the extra CR character. This makes tests 1022 and 1023 pass on Linux with a CRLF checkout. Ref: curl#1344 (comment) Closes curl#1422
This makes test 1135 pass with CRLF checkouts. Ref: curl#1344 (comment) Closes curl#1422
|
Thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
There are currently 5 tests failing with CRLF line endings:
Tests 1221 and 1222:
They are failing on Linux because Bash (and other shells) errors out on CR characters with "\r: command not found" in otherwise empty lines, so force them to LF line endings.
Test 1035:
This test is failing (also on Windows) because data/test1035 expects the CURL_EXTERN lines to have LF line endings. Strip trailing CR in extern-scan.pl to fix this.
Tests 1022 and 1023:
They are failing because the CR is treated as part of the version number. Fix this by ignoring everything that comes after the version number.
Ref: #1344 (comment)