[llvm] d6cbc95 - Add --strip-trailing-cr to compression tests so they pass on Windows.

[Hubert Tong via llvm-commits]

Hi,

I do not recall seeing a pre-commit review of this change. The
`--strip-trailing-cr` option is not portable. Perhaps the POSIX `-b` (
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/diff.html) would
cover your use case?

-- HT

On Wed, Dec 4, 2019 at 4:24 PM Amy Huang via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

>
> Author: Amy Huang
> Date: 2019-12-04T13:23:27-08:00
> New Revision: d6cbc9528d46d30416a6f9cd6c8570b704a0bd33
>
> URL:
> https://github.com/llvm/llvm-project/commit/d6cbc9528d46d30416a6f9cd6c8570b704a0bd33
> DIFF:
> https://github.com/llvm/llvm-project/commit/d6cbc9528d46d30416a6f9cd6c8570b704a0bd33.diff
>
> LOG: Add --strip-trailing-cr to compression tests so they pass on Windows.
>
> 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 66b0543d7a41..e097432f74a6 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  %S/Inputs/profile-symbol-list.expected %t.4.output
> +; RUN:
> diff  --strip-trailing-cr %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 7e495b6d9512..d1c0991ba3fb 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  %t.2.proftext %S/Inputs/sample-profile.proftext
> +RUN:
> diff  --strip-trailing-cr %t.2.proftext %S/Inputs/sample-profile.proftext
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191204/4512087a/attachment.html>