[llvm] 8b8a7d1 - Revert "Add --strip-trailing-cr to compression tests so they pass on Windows."

[Xiangling Liao via llvm-commits]

Author: Xiangling Liao
Date: 2019-12-04T17:26:30-05:00
New Revision: 8b8a7d1ecfb7fd07ffda4a34ef167074e841d3bc

URL: https://github.com/llvm/llvm-project/commit/8b8a7d1ecfb7fd07ffda4a34ef167074e841d3bc
DIFF: https://github.com/llvm/llvm-project/commit/8b8a7d1ecfb7fd07ffda4a34ef167074e841d3bc.diff

LOG: 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.

Added: 
    

Modified: 
    llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test
    llvm/test/tools/llvm-profdata/roundtrip-compress.test

Removed: 
    


################################################################################
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