diff options
| author | Vedant Kumar <vsk@apple.com> | 2017-11-17 21:18:32 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2017-11-17 21:18:32 +0000 |
| commit | 188efda585f1da5ab91eedfe75a292bf6b6fd803 (patch) | |
| tree | 07ab7ddc23b8dce0acb78bdcb1f434e6669e81ef /llvm/test/tools/llvm-profdata | |
| parent | f413c7852eda73d74e288b4648331677673c043d (diff) | |
| download | bcm5719-llvm-188efda585f1da5ab91eedfe75a292bf6b6fd803.tar.gz bcm5719-llvm-188efda585f1da5ab91eedfe75a292bf6b6fd803.zip | |
[llvm-profdata] Don't treat non-fatal merge errors as fatal
This fixes an issue seen on the coverage bot:
http://lab.llvm.org:8080/green/view/Experimental/job/clang-stage2-coverage-R/1930
Profile merging shouldn't fail if a single counter mismatch is detected.
llvm-svn: 318555
Diffstat (limited to 'llvm/test/tools/llvm-profdata')
| -rw-r--r-- | llvm/test/tools/llvm-profdata/Inputs/counter-mismatch-1.proftext | 9 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-profdata/threaded-count-mismatch.test | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-profdata/Inputs/counter-mismatch-1.proftext b/llvm/test/tools/llvm-profdata/Inputs/counter-mismatch-1.proftext index d54d0ad6ffe..45d028e1ad0 100644 --- a/llvm/test/tools/llvm-profdata/Inputs/counter-mismatch-1.proftext +++ b/llvm/test/tools/llvm-profdata/Inputs/counter-mismatch-1.proftext @@ -2,3 +2,12 @@ foo 1024 1 0 + +foo +1024 +5 +0 +0 +0 +0 +0 diff --git a/llvm/test/tools/llvm-profdata/threaded-count-mismatch.test b/llvm/test/tools/llvm-profdata/threaded-count-mismatch.test index 58c13d626b0..8e704cf85a6 100644 --- a/llvm/test/tools/llvm-profdata/threaded-count-mismatch.test +++ b/llvm/test/tools/llvm-profdata/threaded-count-mismatch.test @@ -1,6 +1,6 @@ # Test multithreaded error reporting. -RUN: not llvm-profdata merge -j 4 -o %t.profdata \ +RUN: llvm-profdata merge -j 4 -o %t.profdata \ RUN: %S/Inputs/counter-mismatch-1.proftext \ RUN: %S/Inputs/counter-mismatch-2.proftext \ RUN: %S/Inputs/counter-mismatch-3.proftext \ |
