diff options
| author | stevewan <wan.yu@ibm.com> | 2019-10-23 11:11:37 -0400 |
|---|---|---|
| committer | David Tenty <daltenty@ibm.com> | 2019-10-23 11:19:01 -0400 |
| commit | 342c02d0ad57f244fed2b4d496c06d7b6dbdb310 (patch) | |
| tree | 1bd478d60e547b9794a95c572f05913b1c1b6bcd /llvm/test/tools/llvm-profdata | |
| parent | 8eda8f8ce85eddf24ff4dbf9783771d6b15db27c (diff) | |
| download | bcm5719-llvm-342c02d0ad57f244fed2b4d496c06d7b6dbdb310.tar.gz bcm5719-llvm-342c02d0ad57f244fed2b4d496c06d7b6dbdb310.zip | |
Fix non-portable GNU diff option
Summary: This is a fix to revision D68839 and rL375023. This patch substitutes POSIX option "-b" for the non-portable GNU option "--strip-trailing-cr".
Reviewers: daltenty, hubert.reinterpretcast
Reviewed By: daltenty
Subscribers: mehdi_amini, hiraditya, steven_wu, dexonsmith, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D69342
Diffstat (limited to 'llvm/test/tools/llvm-profdata')
| -rw-r--r-- | llvm/test/tools/llvm-profdata/profile-symbol-list.test | 2 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-profdata/roundtrip.test | 10 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-profdata/sample-remap.test | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/llvm/test/tools/llvm-profdata/profile-symbol-list.test b/llvm/test/tools/llvm-profdata/profile-symbol-list.test index 66050adedf1..e674433274c 100644 --- a/llvm/test/tools/llvm-profdata/profile-symbol-list.test +++ b/llvm/test/tools/llvm-profdata/profile-symbol-list.test @@ -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 --strip-trailing-cr %S/Inputs/profile-symbol-list.expected %t.4.output +; RUN: diff -b %S/Inputs/profile-symbol-list.expected %t.4.output diff --git a/llvm/test/tools/llvm-profdata/roundtrip.test b/llvm/test/tools/llvm-profdata/roundtrip.test index 65a047afa62..7af76e0a582 100644 --- a/llvm/test/tools/llvm-profdata/roundtrip.test +++ b/llvm/test/tools/llvm-profdata/roundtrip.test @@ -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 --strip-trailing-cr %t.0.proftext %S/Inputs/IR_profile.proftext +RUN: diff -b %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: diff -b %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 +RUN: diff -b %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 +RUN: diff -b %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 +RUN: diff -b %t.4.proftext %S/Inputs/sample-profile.proftext diff --git a/llvm/test/tools/llvm-profdata/sample-remap.test b/llvm/test/tools/llvm-profdata/sample-remap.test index 06646297262..8e69c457266 100644 --- a/llvm/test/tools/llvm-profdata/sample-remap.test +++ b/llvm/test/tools/llvm-profdata/sample-remap.test @@ -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 --strip-trailing-cr %S/Inputs/sample-remap.expected %t.output +; RUN: diff -b %S/Inputs/sample-remap.expected %t.output |
