mirror of
https://github.com/RPCS3/llvm.git
synced 2026-07-21 03:05:26 -04:00
Joel E. Denny
e65499709f
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 in text mode, which in Windows causes `\r\n` to be replaced with `\n`. 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@375020 91177308-0d34-0410-b5e6-96231b3b80d8
19 lines
1.3 KiB
Plaintext
19 lines
1.3 KiB
Plaintext
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 --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 --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 --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 --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 --strip-trailing-cr %t.4.proftext %S/Inputs/sample-profile.proftext
|