RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-01 21:04:04 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

[lit] Fix internal diff's --strip-trailing-cr and use it

Browse Source 
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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374652 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Joel E. Denny
2019-10-12 11:58:30 +00:00
parent 066fa526cb
commit 76211a391a
11 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/MC/AsmParser/preserve-comments.s
+1 -1
View File
@@ -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
test/tools/llvm-cxxmap/remap.test
+1 -1
View File
@@ -1,5 +1,5 @@
RUN: llvm-cxxmap %S/Inputs/before.sym %S/Inputs/after.sym -r %S/Inputs/remap.map -o %t.output -Wambiguous -Wincomplete 2>&1 | FileCheck %s --allow-empty
RUN: diff %S/Inputs/expected %t.output
RUN: diff --strip-trailing-cr %S/Inputs/expected %t.output
CHECK-NOT: warning
CHECK-NOT: error
test/tools/llvm-profdata/profile-symbol-list.test
+1 -1
View File
@@ -2,4 +2,4 @@
; RUN: llvm-profdata merge -sample -extbinary -prof-sym-list=%S/Inputs/profile-symbol-list-2.text %S/Inputs/sample-profile.proftext -o %t.2.output
; RUN: llvm-profdata merge -sample -extbinary %t.1.output %t.2.output -o %t.3.output
; RUN: llvm-profdata show -sample -show-prof-sym-list %t.3.output > %t.4.output
; RUN: diff %S/Inputs/profile-symbol-list.expected %t.4.output
; RUN: diff --strip-trailing-cr %S/Inputs/profile-symbol-list.expected %t.4.output
test/tools/llvm-profdata/roundtrip.test
+5 -5
View File
@@ -1,18 +1,18 @@
RUN: llvm-profdata merge -o %t.0.profdata %S/Inputs/IR_profile.proftext
RUN: llvm-profdata show -o %t.0.proftext -all-functions -text %t.0.profdata
RUN: diff %t.0.proftext %S/Inputs/IR_profile.proftext
RUN: diff --strip-trailing-cr %t.0.proftext %S/Inputs/IR_profile.proftext
RUN: llvm-profdata merge -o %t.1.profdata %t.0.proftext
RUN: llvm-profdata show -o %t.1.proftext -all-functions -text %t.1.profdata
RUN: diff %t.1.proftext %S/Inputs/IR_profile.proftext
RUN: diff --strip-trailing-cr %t.1.proftext %S/Inputs/IR_profile.proftext
RUN: llvm-profdata merge --sample --binary -output=%t.2.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --text -output=%t.2.proftext %t.2.profdata
RUN: diff %t.2.proftext %S/Inputs/sample-profile.proftext
RUN: diff --strip-trailing-cr %t.2.proftext %S/Inputs/sample-profile.proftext
# Round trip from text --> extbinary --> text
RUN: llvm-profdata merge --sample --extbinary -output=%t.3.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --text -output=%t.3.proftext %t.3.profdata
RUN: diff %t.3.proftext %S/Inputs/sample-profile.proftext
RUN: diff --strip-trailing-cr %t.3.proftext %S/Inputs/sample-profile.proftext
# Round trip from text --> binary --> extbinary --> text
RUN: llvm-profdata merge --sample --binary -output=%t.4.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --extbinary -output=%t.5.profdata %t.4.profdata
RUN: llvm-profdata merge --sample --text -output=%t.4.proftext %t.5.profdata
RUN: diff %t.4.proftext %S/Inputs/sample-profile.proftext
RUN: diff --strip-trailing-cr %t.4.proftext %S/Inputs/sample-profile.proftext
test/tools/llvm-profdata/sample-remap.test
+1 -1
View File
@@ -1,2 +1,2 @@
; RUN: llvm-profdata merge -sample -text %S/Inputs/sample-remap.proftext -r %S/Inputs/sample-remap.remap -o %t.output
; RUN: diff %S/Inputs/sample-remap.expected %t.output
; RUN: diff --strip-trailing-cr %S/Inputs/sample-remap.expected %t.output