This is an archive of the discontinued LLVM Phabricator instance.

Differential D71036

Use diff -b on zlib tests so they pass on Windows
ClosedPublic

Authored by akhuang on Dec 4 2019, 2:57 PM.

Details

Reviewers
hubert.reinterpretcast
rnk
Commits
rG23e63a906d03: Use diff -b on zlib tests so they pass on Windows

Diff Detail

Event Timeline

akhuang created this revision.Dec 4 2019, 2:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 4 2019, 2:57 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B41890: Diff 232221.Dec 4 2019, 2:57 PM
akhuang added a reviewer: rnk.Dec 5 2019, 11:08 AM
hubert.reinterpretcast accepted this revision.Dec 5 2019, 11:24 AM

LGTM.

This revision is now accepted and ready to land.Dec 5 2019, 11:24 AM
Closed by commit rG23e63a906d03: Use diff -b on zlib tests so they pass on Windows (authored by akhuang). · Explain WhyDec 5 2019, 11:40 AM
This revision was automatically updated to reflect the committed changes.
hans added a subscriber: hans.Dec 10 2019, 1:42 AM
hans added inline comments.
llvm/test/tools/llvm-profdata/roundtrip-compress.test
5

It needs -b here too. Added in bfb53c55b8a.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-profdata/
2 lines
2 lines

Diff 232221

llvm/test/tools/llvm-profdata/profile-symbol-list-compress.test

REQUIRES: zlib REQUIRES: zlib
; RUN: llvm-profdata merge -sample -extbinary -compress-all-sections -prof-sym-list=%S/Inputs/profile-symbol-list-1.text %S/Inputs/sample-profile.proftext -o %t.1.output ; RUN: llvm-profdata merge -sample -extbinary -compress-all-sections -prof-sym-list=%S/Inputs/profile-symbol-list-1.text %S/Inputs/sample-profile.proftext -o %t.1.output
; 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 -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 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: 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 -b %S/Inputs/profile-symbol-list.expected %t.4.output

llvm/test/tools/llvm-profdata/roundtrip-compress.test

REQUIRES: zlib REQUIRES: zlib
# Round trip from text --> compressed extbinary --> text # Round trip from text --> compressed extbinary --> text
RUN: llvm-profdata merge --sample --extbinary -compress-all-sections -output=%t.1.profdata %S/Inputs/sample-profile.proftext RUN: llvm-profdata merge --sample --extbinary -compress-all-sections -output=%t.1.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --text -output=%t.1.proftext %t.1.profdata RUN: llvm-profdata merge --sample --text -output=%t.1.proftext %t.1.profdata
RUN: diff %t.1.proftext %S/Inputs/sample-profile.proftext RUN: diff %t.1.proftext %S/Inputs/sample-profile.proftext
hansUnsubmitted
Not Done
ReplyInline Actions

It needs -b here too. Added in bfb53c55b8a.

hans: It needs -b here too. Added in bfb53c55b8a.
# Round trip from text --> binary --> compressed extbinary --> text # Round trip from text --> binary --> compressed extbinary --> text
RUN: llvm-profdata merge --sample --binary -output=%t.2.profdata %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 --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: llvm-profdata merge --sample --text -output=%t.2.proftext %t.3.profdata
RUN: diff %t.2.proftext %S/Inputs/sample-profile.proftext RUN: diff -b %t.2.proftext %S/Inputs/sample-profile.proftext