diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 11:58:30 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 11:58:30 +0000 |
| commit | 0f80927316c7b12e5c170adec26608dda449497c (patch) | |
| tree | 38de032c157984c81b5103844a961686266d0fcc /llvm/test/MC/AsmParser | |
| parent | 92a8294f9eda2d9b3f7718cba68269a4fc8eea10 (diff) | |
| download | bcm5719-llvm-0f80927316c7b12e5c170adec26608dda449497c.tar.gz bcm5719-llvm-0f80927316c7b12e5c170adec26608dda449497c.zip | |
[lit] Fix internal diff's --strip-trailing-cr and use it
Using GNU diff, `--strip-trailing-cr` removes a `\r` appearing before
a `\n` at the end of a line. Without this patch, lit's internal diff
only removes `\r` if it appears as the last character. That seems
useless. This patch fixes that.
This patch also adds `--strip-trailing-cr` to some tests that fail on
Windows bots when D68664 is applied. Based on what I see in the bot
logs, I think the following is happening. In each test there, lit
diff is comparing a file with `\r\n` line endings to a file with `\n`
line endings. Without D68664, lit diff reads those files with
Python's universal newlines support activated, causing `\r` to be
dropped. However, with D68664, lit diff reads the files in binary
mode instead and thus reports that every line is different, just as
GNU diff does (at least under Ubuntu). Adding `--strip-trailing-cr`
to those tests restores the previous behavior while permitting the
behavior of lit diff to be more like GNU diff.
Reviewed By: rnk
Differential Revision: https://reviews.llvm.org/D68839
llvm-svn: 374652
Diffstat (limited to 'llvm/test/MC/AsmParser')
| -rw-r--r-- | llvm/test/MC/AsmParser/preserve-comments.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/test/MC/AsmParser/preserve-comments.s b/llvm/test/MC/AsmParser/preserve-comments.s index a0f50196213..90a71ea7984 100644 --- a/llvm/test/MC/AsmParser/preserve-comments.s +++ b/llvm/test/MC/AsmParser/preserve-comments.s @@ -1,5 +1,5 @@ #RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t - #RUN: diff %s %t + #RUN: diff --strip-trailing-cr %s %t .text foo: #Comment here |
