llvm-cov: Added test.h header to tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196632 91177308-0d34-0410-b5e6-96231b3b80d8

7 files changed, 86 insertions, 80 deletions

diff --git a/test/tools/llvm-cov/Inputs/test.cpp b/test/tools/llvm-cov/Inputs/test.cpp
index 07bc3f294c..e580e5ae0c 100644
--- a/test/tools/llvm-cov/Inputs/test.cpp
+++ b/test/tools/llvm-cov/Inputs/test.cpp
@@ -1,3 +1,4 @@
+#include "test.h"
 #include <cstdlib>
 
 bool on = false;
@@ -6,10 +7,6 @@ double grid[10][10] = {0};
 const char * hello = "world";
 const char * world = "hello";
 
-struct A {
-  virtual void B();
-};
-
 void A::B() {}
 
 void useless() {}
diff --git a/test/tools/llvm-cov/Inputs/test.cpp.orig_gcov b/test/tools/llvm-cov/Inputs/test.cpp.orig_gcov
index a3dacc269e..871e3ba644 100644
--- a/test/tools/llvm-cov/Inputs/test.cpp.orig_gcov
+++ b/test/tools/llvm-cov/Inputs/test.cpp.orig_gcov
@@ -3,80 +3,77 @@
         -:    0:Data:test.gcda
         -:    0:Runs:2
         -:    0:Programs:1
-        -:    1:#include <cstdlib>
-        -:    2:
-        -:    3:bool on = false;
-        -:    4:int len = 42;
-        -:    5:double grid[10][10] = {0};
-        -:    6:const char * hello = "world";
-        -:    7:const char * world = "hello";
-        -:    8:
-        4:    9:struct A {
-        -:   10:  virtual void B();
-        -:   11:};
-        -:   12:
-8589934592:   13:void A::B() {}
-        -:   14:
-    #####:   15:void useless() {}
-        -:   16:
-        -:   17:double more_useless() {
-    #####:   18:  return 0;
-        -:   19:}
-        -:   20:
-        -:   21:int foo() {
-        2:   22:  on = true;
-        2:   23:  return 3;
-        -:   24:}
-        -:   25:
-        -:   26:int bar() {
-    #####:   27:  len--;
-    #####:   28:  return foo() + 45;
-        -:   29:}
-        -:   30:
-        8:   31:void assign(int ii, int jj) {
-        8:   32:  grid[ii][jj] = (ii+1) * (jj+1);
-        8:   33:}
-        -:   34:
-        -:   35:void initialize_grid() {
-       12:   36:  for (int ii = 0; ii < 2; ii++)
-       24:   37:    for (int jj = 0; jj < 2; jj++)
-       12:   38:      assign(ii, jj);
-        2:   39:}
+        -:    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:
+8589934592:   10:void A::B() {}
+        -:   11:
+    #####:   12:void useless() {}
+        -:   13:
+        -:   14:double more_useless() {
+    #####:   15:  return 0;
+        -:   16:}
+        -:   17:
+        -:   18:int foo() {
+        2:   19:  on = true;
+        2:   20:  return 3;
+        -:   21:}
+        -:   22:
+        -:   23:int bar() {
+    #####:   24:  len--;
+    #####:   25:  return foo() + 45;
+        -:   26:}
+        -:   27:
+        8:   28:void assign(int ii, int jj) {
+        8:   29:  grid[ii][jj] = (ii+1) * (jj+1);
+        8:   30:}
+        -:   31:
+        -:   32:void initialize_grid() {
+       12:   33:  for (int ii = 0; ii < 2; ii++)
+       24:   34:    for (int jj = 0; jj < 2; jj++)
+       12:   35:      assign(ii, jj);
+        2:   36:}
+        -:   37:
+        -:   38:int main() {
+        2:   39:  initialize_grid();
         -:   40:
-        -:   41:int main() {
-        2:   42:  initialize_grid();
-        -:   43:
-        2:   44:  int a = 2;
-        2:   45:  on = rand() % 2;
-        2:   46:  if (on) {
-        2:   47:    foo();
-        2:   48:    ++a;
-        2:   49:  } else {
-    #####:   50:    bar();
-    #####:   51:    a += rand();
-        -:   52:  }
-        -:   53:
-       44:   54:  for (int ii = 0; ii < 10; ++ii) {
-       20:   55:    switch (rand() % 5) {
-        -:   56:      case 0:
-        4:   57:        a += rand();
-        4:   58:        break;
-        -:   59:      case 1:
-        -:   60:      case 2:
-        2:   61:        a += rand() / rand();
-        2:   62:        break;
-        -:   63:      case 3:
-        6:   64:        a -= rand();
-        6:   65:        break;
-        -:   66:      default:
-        8:   67:        a = -1;
-        8:   68:    }
-       20:   69:  }
-        -:   70:
-        2:   71:  A thing;
-17179869188:   72:  for (uint64_t ii = 0; ii < 4294967296; ++ii)
-8589934592:   73:    thing.B();
-        -:   74:
-        2:   75:  return a + 8 + grid[2][3] + len;
-        -:   76:  return more_useless();
-        -:   77:}
+        2:   41:  int a = 2;
+        2:   42:  on = rand() % 2;
+        2:   43:  if (on) {
+        2:   44:    foo();
+        2:   45:    ++a;
+        2:   46:  } else {
+    #####:   47:    bar();
+    #####:   48:    a += rand();
+        -:   49:  }
+        -:   50:
+       44:   51:  for (int ii = 0; ii < 10; ++ii) {
+       20:   52:    switch (rand() % 5) {
+        -:   53:      case 0:
+        4:   54:        a += rand();
+        4:   55:        break;
+        -:   56:      case 1:
+        -:   57:      case 2:
+        2:   58:        a += rand() / rand();
+        2:   59:        break;
+        -:   60:      case 3:
+        6:   61:        a -= rand();
+        6:   62:        break;
+        -:   63:      default:
+        8:   64:        a = -1;
+        8:   65:    }
+       20:   66:  }
+        -:   67:
+        2:   68:  A thing;
+17179869188:   69:  for (uint64_t ii = 0; ii < 4294967296; ++ii)
+8589934592:   70:    thing.B();
+        -:   71:
+        2:   72:  return a + 8 + grid[2][3] + len;
+        -:   73:  return more_useless();
+        -:   74:}
diff --git a/test/tools/llvm-cov/Inputs/test.gcda b/test/tools/llvm-cov/Inputs/test.gcda
index 9c21d19b1f..613e3a85c0 100644
--- a/test/tools/llvm-cov/Inputs/test.gcda
+++ b/test/tools/llvm-cov/Inputs/test.gcda
diff --git a/test/tools/llvm-cov/Inputs/test.gcno b/test/tools/llvm-cov/Inputs/test.gcno
index ad748799ee..24f1c82476 100644
--- a/test/tools/llvm-cov/Inputs/test.gcno
+++ b/test/tools/llvm-cov/Inputs/test.gcno
diff --git a/test/tools/llvm-cov/Inputs/test.h b/test/tools/llvm-cov/Inputs/test.h
new file mode 100644
index 0000000000..55d9c6aa8c
--- /dev/null
+++ b/test/tools/llvm-cov/Inputs/test.h
@@ -0,0 +1,3 @@
+struct A {
+  virtual void B();
+};
diff --git a/test/tools/llvm-cov/Inputs/test.h.orig_gcov b/test/tools/llvm-cov/Inputs/test.h.orig_gcov
new file mode 100644
index 0000000000..4ba58c9fdc
--- /dev/null
+++ b/test/tools/llvm-cov/Inputs/test.h.orig_gcov
@@ -0,0 +1,8 @@
+        -:    0:Source:./test.h
+        -:    0:Graph:test.gcno
+        -:    0:Data:test.gcda
+        -:    0:Runs:2
+        -:    0:Programs:1
+        4:    1:struct A {
+        -:    2:  virtual void B();
+        -:    3:};
diff --git a/test/tools/llvm-cov/llvm-cov.test b/test/tools/llvm-cov/llvm-cov.test
index 48fee45871..184f858b8c 100644
--- a/test/tools/llvm-cov/llvm-cov.test
+++ b/test/tools/llvm-cov/llvm-cov.test
@@ -7,6 +7,7 @@ RUN: cp %p/Inputs/test* .
 
 RUN: llvm-cov -gcno=test.gcno -gcda=test.gcda
 RUN: diff -aub test.cpp.orig_gcov test.cpp.gcov
+RUN: diff -aub test.h.orig_gcov test.h.gcov
 
 RUN: not llvm-cov -gcno=test_read_fail.gcno -gcda=test.gcda