From 8b8a7d1ecfb7fd07ffda4a34ef167074e841d3bc Mon Sep 17 00:00:00 2001 From: Xiangling Liao Date: Wed, 4 Dec 2019 17:23:57 -0500 Subject: [PATCH] Revert "Add --strip-trailing-cr to compression tests so they pass on Windows." This reverts commit d6cbc9528d46d30416a6f9cd6c8570b704a0bd33. It causes the tests to fail on AIX. --- llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test | 2 +- llvm/test/tools/llvm-profdata/roundtrip-compress.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test b/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test index e097432f74a6..66b0543d7a41 100644 --- a/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test +++ b/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test @@ -3,4 +3,4 @@ REQUIRES: zlib ; RUN: llvm-profdata merge -sample -extbinary -compress-all-sections -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 -compress-all-sections %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 %S/Inputs/profile-symbol-list.expected %t.4.output diff --git a/llvm/test/tools/llvm-profdata/roundtrip-compress.test b/llvm/test/tools/llvm-profdata/roundtrip-compress.test index d1c0991ba3fb..7e495b6d9512 100644 --- a/llvm/test/tools/llvm-profdata/roundtrip-compress.test +++ b/llvm/test/tools/llvm-profdata/roundtrip-compress.test @@ -7,4 +7,4 @@ RUN: diff %t.1.proftext %S/Inputs/sample-profile.proftext RUN: llvm-profdata merge --sample --binary -output=%t.2.profdata %S/Inputs/sample-profile.proftext RUN: llvm-profdata merge --sample --extbinary -compress-all-sections -output=%t.3.profdata %t.2.profdata RUN: llvm-profdata merge --sample --text -output=%t.2.proftext %t.3.profdata -RUN: diff --strip-trailing-cr %t.2.proftext %S/Inputs/sample-profile.proftext +RUN: diff %t.2.proftext %S/Inputs/sample-profile.proftext