<div dir="ltr">Sorry about that! I'll try using -b, thanks. </div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Dec 4, 2019 at 2:42 PM Hubert Tong <<a href="mailto:hubert.reinterpretcast@gmail.com">hubert.reinterpretcast@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>Hi,</div><div><br></div><div>I do not recall seeing a pre-commit review of this change. The `--strip-trailing-cr` option is not portable. Perhaps the POSIX `-b` (<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/diff.html" target="_blank">https://pubs.opengroup.org/onlinepubs/9699919799/utilities/diff.html</a>) would cover your use case?<br></div><div><br></div><div>-- HT<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Dec 4, 2019 at 4:24 PM Amy Huang via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Amy Huang<br>
Date: 2019-12-04T13:23:27-08:00<br>
New Revision: d6cbc9528d46d30416a6f9cd6c8570b704a0bd33<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/d6cbc9528d46d30416a6f9cd6c8570b704a0bd33" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/d6cbc9528d46d30416a6f9cd6c8570b704a0bd33</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/d6cbc9528d46d30416a6f9cd6c8570b704a0bd33.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/d6cbc9528d46d30416a6f9cd6c8570b704a0bd33.diff</a><br>
<br>
LOG: Add --strip-trailing-cr to compression tests so they pass on Windows.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test<br>
    llvm/test/tools/llvm-profdata/roundtrip-compress.test<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test b/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test<br>
index 66b0543d7a41..e097432f74a6 100644<br>
--- a/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test<br>
+++ b/llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test<br>
@@ -3,4 +3,4 @@ REQUIRES: zlib<br>
 ; 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<br>
 ; RUN: llvm-profdata merge -sample -extbinary -compress-all-sections %t.1.output %t.2.output -o %t.3.output<br>
 ; RUN: llvm-profdata show -sample -show-prof-sym-list %t.3.output > %t.4.output<br>
-; RUN: <br>
diff  %S/Inputs/profile-symbol-list.expected %t.4.output<br>
+; RUN: <br>
diff  --strip-trailing-cr %S/Inputs/profile-symbol-list.expected %t.4.output<br>
<br>
diff  --git a/llvm/test/tools/llvm-profdata/roundtrip-compress.test b/llvm/test/tools/llvm-profdata/roundtrip-compress.test<br>
index 7e495b6d9512..d1c0991ba3fb 100644<br>
--- a/llvm/test/tools/llvm-profdata/roundtrip-compress.test<br>
+++ b/llvm/test/tools/llvm-profdata/roundtrip-compress.test<br>
@@ -7,4 +7,4 @@ RUN: <br>
diff  %t.1.proftext %S/Inputs/sample-profile.proftext<br>
 RUN: llvm-profdata merge --sample --binary -output=%t.2.profdata %S/Inputs/sample-profile.proftext<br>
 RUN: llvm-profdata merge --sample --extbinary -compress-all-sections -output=%t.3.profdata %t.2.profdata<br>
 RUN: llvm-profdata merge --sample --text -output=%t.2.proftext %t.3.profdata<br>
-RUN: <br>
diff  %t.2.proftext %S/Inputs/sample-profile.proftext<br>
+RUN: <br>
diff  --strip-trailing-cr %t.2.proftext %S/Inputs/sample-profile.proftext<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>
</blockquote></div>