From: Vedant Kumar <vsk@apple.com>
Date: Wed, 29 Jun 2016 17:47:08 +0000 (+0000)
Subject: [llvm-cov] Change some FileCheck prefixes to make tests reusable (NFC)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdd649ed06f0fadcafb1d5c370e57d509b7ce2f6;p=llvm

[llvm-cov] Change some FileCheck prefixes to make tests reusable (NFC)

I'm planning on extending these two tests with checks that validate
html coverage reports. Make it easier to extend them by not using a
prefix called "CHECK".

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

diff --git a/test/tools/llvm-cov/showLineExecutionCounts.cpp b/test/tools/llvm-cov/showLineExecutionCounts.cpp
index 16814837576..b8ccdd4aa3e 100644
--- a/test/tools/llvm-cov/showLineExecutionCounts.cpp
+++ b/test/tools/llvm-cov/showLineExecutionCounts.cpp
@@ -3,37 +3,37 @@
 
 // before any coverage              // WHOLE-FILE:      | [[@LINE]]|// before
                                     // FILTER-NOT:      | [[@LINE-1]]|// before
-int main() {                             // CHECK:   161| [[@LINE]]|int main(
-  int x = 0;                             // CHECK:   161| [[@LINE]]|  int x
-                                         // CHECK:   161| [[@LINE]]|
-  if (x) {                               // CHECK:     0| [[@LINE]]|  if (x)
-    x = 0;                               // CHECK:     0| [[@LINE]]|    x = 0
-  } else {                               // CHECK:   161| [[@LINE]]|  } else
-    x = 1;                               // CHECK:   161| [[@LINE]]|    x = 1
-  }                                      // CHECK:   161| [[@LINE]]|  }
-                                         // CHECK:   161| [[@LINE]]|
-  for (int i = 0; i < 100; ++i) {        // CHECK: 16.2k| [[@LINE]]|  for (
-    x = 1;                               // CHECK: 16.1k| [[@LINE]]|    x = 1
-  }                                      // CHECK: 16.1k| [[@LINE]]|  }
-                                         // CHECK:   161| [[@LINE]]|
-  x = x < 10 ? x + 1 : x - 1;            // CHECK:   161| [[@LINE]]|  x =
-  x = x > 10 ?                           // CHECK:   161| [[@LINE]]|  x =
-        x - 1:                           // CHECK:     0| [[@LINE]]|        x
-        x + 1;                           // CHECK:   161| [[@LINE]]|        x
-                                         // CHECK:   161| [[@LINE]]|
-  return 0;                              // CHECK:   161| [[@LINE]]|  return
-}                                        // CHECK:   161| [[@LINE]]|}
+int main() {                              // TEXT:   161| [[@LINE]]|int main(
+  int x = 0;                              // TEXT:   161| [[@LINE]]|  int x
+                                          // TEXT:   161| [[@LINE]]|
+  if (x) {                                // TEXT:     0| [[@LINE]]|  if (x)
+    x = 0;                                // TEXT:     0| [[@LINE]]|    x = 0
+  } else {                                // TEXT:   161| [[@LINE]]|  } else
+    x = 1;                                // TEXT:   161| [[@LINE]]|    x = 1
+  }                                       // TEXT:   161| [[@LINE]]|  }
+                                          // TEXT:   161| [[@LINE]]|
+  for (int i = 0; i < 100; ++i) {         // TEXT: 16.2k| [[@LINE]]|  for (
+    x = 1;                                // TEXT: 16.1k| [[@LINE]]|    x = 1
+  }                                       // TEXT: 16.1k| [[@LINE]]|  }
+                                          // TEXT:   161| [[@LINE]]|
+  x = x < 10 ? x + 1 : x - 1;             // TEXT:   161| [[@LINE]]|  x =
+  x = x > 10 ?                            // TEXT:   161| [[@LINE]]|  x =
+        x - 1:                            // TEXT:     0| [[@LINE]]|        x
+        x + 1;                            // TEXT:   161| [[@LINE]]|        x
+                                          // TEXT:   161| [[@LINE]]|
+  return 0;                               // TEXT:   161| [[@LINE]]|  return
+}                                         // TEXT:   161| [[@LINE]]|}
 // after coverage                   // WHOLE-FILE:      | [[@LINE]]|// after
                                     // FILTER-NOT:      | [[@LINE-1]]|// after
 
-// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck -check-prefixes=CHECK,WHOLE-FILE %s
-// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence -name=main %s | FileCheck -check-prefixes=CHECK,FILTER %s
+// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck -check-prefixes=TEXT,WHOLE-FILE %s
+// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence -name=main %s | FileCheck -check-prefixes=TEXT,FILTER %s
 
 // Test -output-dir.
 // RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -o %t.dir -instr-profile %t.profdata -filename-equivalence %s
 // RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -output-dir %t.dir -instr-profile %t.profdata -filename-equivalence -name=main %s
-// RUN: FileCheck -check-prefixes=CHECK,WHOLE-FILE -input-file %t.dir/coverage/tmp/showLineExecutionCounts.cpp.txt %s
-// RUN: FileCheck -check-prefixes=CHECK,FILTER -input-file %t.dir/functions.txt %s
+// RUN: FileCheck -check-prefixes=TEXT,WHOLE-FILE -input-file %t.dir/coverage/tmp/showLineExecutionCounts.cpp.txt %s
+// RUN: FileCheck -check-prefixes=TEXT,FILTER -input-file %t.dir/functions.txt %s
 //
 // Test index creation.
 // RUN: FileCheck -check-prefix=INDEX -input-file %t.dir/index.txt %s
diff --git a/test/tools/llvm-cov/showTemplateInstantiations.cpp b/test/tools/llvm-cov/showTemplateInstantiations.cpp
index 2ae7b1a7709..77ecb473400 100644
--- a/test/tools/llvm-cov/showTemplateInstantiations.cpp
+++ b/test/tools/llvm-cov/showTemplateInstantiations.cpp
@@ -1,5 +1,5 @@
-// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence %s | FileCheck -check-prefix=CHECK -check-prefix=ALL %s
-// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence -name=_Z4funcIbEiT_ %s | FileCheck -check-prefix=CHECK -check-prefix=FILTER %s
+// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence %s | FileCheck -check-prefixes=SHARED,ALL %s
+// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence -name=_Z4funcIbEiT_ %s | FileCheck -check-prefixes=SHARED,FILTER %s
 
 // before coverage   // ALL:          | [[@LINE]]|// before
                      // FILTER-NOT:   | [[@LINE-1]]|// before
@@ -12,14 +12,14 @@ int func(T x) {      // ALL-NEXT:    2| [[@LINE]]|int func(T x) {
   int j = 1;         // ALL-NEXT:    0| [[@LINE]]|  int j = 1;
 }                    // ALL-NEXT:    2| [[@LINE]]|}
 
-                     // CHECK:       {{^ *(\| )?}}_Z4funcIbEiT_:
-                     // CHECK-NEXT:  1| [[@LINE-9]]|int func(T x) {
-                     // CHECK-NEXT:  1| [[@LINE-9]]|  if(x)
-                     // CHECK-NEXT:  1| [[@LINE-9]]|    return 0;
-                     // CHECK-NEXT:  1| [[@LINE-9]]|  else
-                     // CHECK-NEXT:  0| [[@LINE-9]]|    return 1;
-                     // CHECK-NEXT:  0| [[@LINE-9]]|  int j = 1;
-                     // CHECK-NEXT:  1| [[@LINE-9]]|}
+                     // SHARED:       {{^ *(\| )?}}_Z4funcIbEiT_:
+                     // SHARED-NEXT:  1| [[@LINE-9]]|int func(T x) {
+                     // SHARED-NEXT:  1| [[@LINE-9]]|  if(x)
+                     // SHARED-NEXT:  1| [[@LINE-9]]|    return 0;
+                     // SHARED-NEXT:  1| [[@LINE-9]]|  else
+                     // SHARED-NEXT:  0| [[@LINE-9]]|    return 1;
+                     // SHARED-NEXT:  0| [[@LINE-9]]|  int j = 1;
+                     // SHARED-NEXT:  1| [[@LINE-9]]|}
 
                      // ALL:         {{^ *}}| _Z4funcIiEiT_:
                      // FILTER-NOT:  {{^ *(\| )?}} _Z4funcIiEiT_: