InstrProf: Use the proftext format for these coverage tests

This format's easier to understand and update by hand.

llvm-svn: 231686

6 files changed, 24 insertions, 3 deletions

diff --git a/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.profdata b/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.profdata
deleted file mode 100644
index 87122272396..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.profdata
+++ /dev/null
diff --git a/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.proftext b/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.proftext
new file mode 100644
index 00000000000..1966d42ce30
--- /dev/null
+++ b/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.proftext
@@ -0,0 +1,8 @@
+main
+0x000000000028434d
+5
+1
+0
+100
+1
+0
diff --git a/llvm/test/tools/llvm-cov/Inputs/regionMarkers.profdata b/llvm/test/tools/llvm-cov/Inputs/regionMarkers.profdata
deleted file mode 100644
index 87122272396..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/regionMarkers.profdata
+++ /dev/null
diff --git a/llvm/test/tools/llvm-cov/Inputs/regionMarkers.proftext b/llvm/test/tools/llvm-cov/Inputs/regionMarkers.proftext
new file mode 100644
index 00000000000..1966d42ce30
--- /dev/null
+++ b/llvm/test/tools/llvm-cov/Inputs/regionMarkers.proftext
@@ -0,0 +1,8 @@
+main
+0x000000000028434d
+5
+1
+0
+100
+1
+0
diff --git a/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp b/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
index 625c3f2732d..da6c9bd9024 100644
--- a/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
+++ b/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
@@ -1,5 +1,5 @@
-// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %S/Inputs/lineExecutionCounts.profdata -no-colors -filename-equivalence %s | FileCheck -check-prefix=CHECK -check-prefix=WHOLE-FILE %s
-// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %S/Inputs/lineExecutionCounts.profdata -no-colors -filename-equivalence -name=main %s | FileCheck -check-prefix=CHECK -check-prefix=FILTER %s
+// Basic handling of line counts.
+// RUN: llvm-profdata merge %S/Inputs/lineExecutionCounts.proftext -o %t.profdata
 
 // before any coverage              // WHOLE-FILE:    | [[@LINE]]|// before
                                     // FILTER-NOT:    | [[@LINE-1]]|// before
@@ -26,5 +26,8 @@ int main() {                             // CHECK:   1| [[@LINE]]|int main(
 // after coverage                   // WHOLE-FILE:    | [[@LINE]]|// after
                                     // FILTER-NOT:    | [[@LINE-1]]|// after
 
+// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -no-colors -filename-equivalence %s | FileCheck -check-prefix=CHECK -check-prefix=WHOLE-FILE %s
+// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -no-colors -filename-equivalence -name=main %s | FileCheck -check-prefix=CHECK -check-prefix=FILTER %s
+
 // llvm-cov doesn't work on big endian yet
 // XFAIL: powerpc64-, s390x, mips-, mips64-, sparc
diff --git a/llvm/test/tools/llvm-cov/showRegionMarkers.cpp b/llvm/test/tools/llvm-cov/showRegionMarkers.cpp
index 136c3bf7cac..1acc8d6f959 100644
--- a/llvm/test/tools/llvm-cov/showRegionMarkers.cpp
+++ b/llvm/test/tools/llvm-cov/showRegionMarkers.cpp
@@ -1,4 +1,4 @@
-// RUN: llvm-cov show %S/Inputs/regionMarkers.covmapping -instr-profile %S/Inputs/regionMarkers.profdata -show-regions -dump -filename-equivalence %s 2>&1 | FileCheck %s
+// RUN: llvm-profdata merge %S/Inputs/regionMarkers.proftext -o %t.profdata
 
 int main() {                      // CHECK: Marker at [[@LINE]]:12 = 1
   int x = 0;
@@ -22,5 +22,7 @@ int main() {                      // CHECK: Marker at [[@LINE]]:12 = 1
   return 0;
 }
 
+// RUN: llvm-cov show %S/Inputs/regionMarkers.covmapping -instr-profile %t.profdata -show-regions -dump -filename-equivalence %s 2>&1 | FileCheck %s
+
 // llvm-cov doesn't work on big endian yet
 // XFAIL: powerpc64-, s390x, mips-, mips64-, sparc