diff options
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_no_gcda.cpp.gcov | 79 | ||||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_no_gcda.h.gcov | 8 | ||||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_no_gcda.output | 8 | ||||
| -rw-r--r-- | test/tools/llvm-cov/llvm-cov.test | 5 | ||||
| -rw-r--r-- | tools/llvm-cov/llvm-cov.cpp | 19 |
5 files changed, 112 insertions, 7 deletions
diff --git a/test/tools/llvm-cov/Inputs/test_no_gcda.cpp.gcov b/test/tools/llvm-cov/Inputs/test_no_gcda.cpp.gcov new file mode 100644 index 0000000000..31353ca0c0 --- /dev/null +++ b/test/tools/llvm-cov/Inputs/test_no_gcda.cpp.gcov @@ -0,0 +1,79 @@ + -: 0:Source:test.cpp + -: 0:Graph:test.gcno + -: 0:Data:- + -: 0:Runs:0 + -: 0:Programs:0 + -: 1:#include "test.h" + -: 2:#include <cstdlib> + -: 3: + -: 4:bool on = false; + -: 5:int len = 42; + -: 6:double grid[10][10] = {0}; + -: 7:const char * hello = "world"; + -: 8:const char * world = "hello"; + -: 9: + #####: 10:void A::B() {} + -: 11: + #####: 12:void useless() {} + -: 13: + -: 14:double more_useless() { + #####: 15: return 0; + -: 16:} + -: 17: + -: 18:int foo() { + #####: 19: on = true; + #####: 20: return 3; + -: 21:} + -: 22: + -: 23:int bar() { + #####: 24: len--; + #####: 25: return foo() + 45; + -: 26:} + -: 27: + #####: 28:void assign(int ii, int jj) { + #####: 29: grid[ii][jj] = (ii+1) * (jj+1); + #####: 30:} + -: 31: + -: 32:void initialize_grid() { + #####: 33: for (int ii = 0; ii < 2; ii++) + #####: 34: for (int jj = 0; jj < 2; jj++) + #####: 35: assign(ii, jj); + #####: 36:} + -: 37: + -: 38:int main() { + #####: 39: initialize_grid(); + -: 40: + #####: 41: int a = 2; + #####: 42: on = rand() % 2; + #####: 43: if (on) { + #####: 44: foo(); + #####: 45: ++a; + #####: 46: } else { + #####: 47: bar(); + #####: 48: a += rand(); + -: 49: } + -: 50: + #####: 51: for (int ii = 0; ii < 10; ++ii) { + #####: 52: switch (rand() % 5) { + -: 53: case 0: + #####: 54: a += rand(); + #####: 55: break; + -: 56: case 1: + -: 57: case 2: + #####: 58: a += rand() / rand(); + #####: 59: break; + -: 60: case 3: + #####: 61: a -= rand(); + #####: 62: break; + -: 63: default: + #####: 64: a = -1; + #####: 65: } + #####: 66: } + -: 67: + #####: 68: A thing; + #####: 69: for (uint64_t ii = 0; ii < 4294967296; ++ii) + #####: 70: thing.B(); + -: 71: + #####: 72: return a + 8 + grid[2][3] + len; + -: 73: return more_useless(); + -: 74:} diff --git a/test/tools/llvm-cov/Inputs/test_no_gcda.h.gcov b/test/tools/llvm-cov/Inputs/test_no_gcda.h.gcov new file mode 100644 index 0000000000..c0a45c61ce --- /dev/null +++ b/test/tools/llvm-cov/Inputs/test_no_gcda.h.gcov @@ -0,0 +1,8 @@ + -: 0:Source:./test.h + -: 0:Graph:test.gcno + -: 0:Data:- + -: 0:Runs:0 + -: 0:Programs:0 + #####: 1:struct A { + -: 2: virtual void B(); + -: 3:}; diff --git a/test/tools/llvm-cov/Inputs/test_no_gcda.output b/test/tools/llvm-cov/Inputs/test_no_gcda.output new file mode 100644 index 0000000000..69adce209b --- /dev/null +++ b/test/tools/llvm-cov/Inputs/test_no_gcda.output @@ -0,0 +1,8 @@ +File 'test.cpp' +Lines executed:0.00% of 38 +test.cpp:creating 'test.cpp.gcov' + +File './test.h' +Lines executed:0.00% of 1 +./test.h:creating './test.h.gcov' + diff --git a/test/tools/llvm-cov/llvm-cov.test b/test/tools/llvm-cov/llvm-cov.test index cb0c99b747..f205cde791 100644 --- a/test/tools/llvm-cov/llvm-cov.test +++ b/test/tools/llvm-cov/llvm-cov.test @@ -48,6 +48,11 @@ RUN: llvm-cov test.c -a -b -c -u | diff -u test_-b.output - RUN: diff -aub test_-a_-b_-c_-u.cpp.gcov test.cpp.gcov RUN: diff -aub test_-a_-b_-c_-u.h.gcov test.h.gcov +# Missing gcda file just gives 0 counts. +RUN: llvm-cov test.c -gcda=no_such_gcda_file | diff -u test_no_gcda.output - +RUN: diff -aub test_no_gcda.cpp.gcov test.cpp.gcov +RUN: diff -aub test_no_gcda.h.gcov test.h.gcov + # Invalid gcno file. RUN: not llvm-cov test.c -gcno=test_read_fail.gcno diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp index f549891694..be8d1c9036 100644 --- a/tools/llvm-cov/llvm-cov.cpp +++ b/tools/llvm-cov/llvm-cov.cpp @@ -84,13 +84,18 @@ int main(int argc, char **argv) { OwningPtr<MemoryBuffer> GCDA_Buff; if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputGCDA, GCDA_Buff)) { - errs() << InputGCDA << ": " << ec.message() << "\n"; - return 1; - } - GCOVBuffer GCDA_GB(GCDA_Buff.get()); - if (!GF.readGCDA(GCDA_GB)) { - errs() << "Invalid .gcda File!\n"; - return 1; + if (ec != errc::no_such_file_or_directory) { + errs() << InputGCDA << ": " << ec.message() << "\n"; + return 1; + } + // Clear the filename to make it clear we didn't read anything. + InputGCDA = "-"; + } else { + GCOVBuffer GCDA_GB(GCDA_Buff.get()); + if (!GF.readGCDA(GCDA_GB)) { + errs() << "Invalid .gcda File!\n"; + return 1; + } } if (DumpGCOV) |