Convert tests using "| wc -l | grep ..." to use the count script.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41097 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr b/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr
index 6fc077d..162d32a 100644
--- a/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr
+++ b/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.*address | wc -l | grep 4
+// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.*address | count 4
 
 void *test1() {
   return __builtin_return_address(1);
diff --git a/test/CFrontend/2004-02-13-Memset.c b/test/CFrontend/2004-02-13-Memset.c
index ca0db7a..89ab9b9 100644
--- a/test/CFrontend/2004-02-13-Memset.c
+++ b/test/CFrontend/2004-02-13-Memset.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.memset | wc -l | grep 3
+// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.memset | count 3
 
 void test(int* X, char *Y) {
   memset(X, 4, 1000);
diff --git a/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c b/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c
index ee74432..598ffb5 100644
--- a/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c
+++ b/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c
@@ -1,5 +1,5 @@
-// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32( i32} | wc -l | grep 2
-// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32(i32} | wc -l | grep 1
+// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32( i32} | count 2
+// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32(i32} | count 1
 
 unsigned t2(unsigned X) {
   return __builtin_clz(X);
diff --git a/test/CFrontend/2006-01-23-FileScopeAsm.c b/test/CFrontend/2006-01-23-FileScopeAsm.c
index 57f7939..fb55a41 100644
--- a/test/CFrontend/2006-01-23-FileScopeAsm.c
+++ b/test/CFrontend/2006-01-23-FileScopeAsm.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
-// RUN:    llvm-dis | grep {foo\[12345\]} | wc -l | grep 5
+// RUN:    llvm-dis | grep {foo\[12345\]} | count 5
 
 __asm__ ("foo1");
 __asm__ ("foo2");
diff --git a/test/CFrontend/2007-04-11-InlineStorageClassC89.c b/test/CFrontend/2007-04-11-InlineStorageClassC89.c
index ca4ed33..ab1f556 100644
--- a/test/CFrontend/2007-04-11-InlineStorageClassC89.c
+++ b/test/CFrontend/2007-04-11-InlineStorageClassC89.c
@@ -1,19 +1,19 @@
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xglobWeak | \
-// RUN:   grep weak | wc -l | grep 1
+// RUN:   grep weak | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | \
-// RUN:   grep weak | wc -l | grep 1
+// RUN:   grep weak | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xWeaknoinline | grep weak | wc -l | grep 1
+// RUN:   grep xWeaknoinline | grep weak | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xWeakextnoinline | grep weak | wc -l | grep 1
+// RUN:   grep xWeakextnoinline | grep weak | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xglobnoWeak | grep -v internal | grep -v weak | \
-// RUN:   grep -v linkonce | wc -l | grep 1
+// RUN:   grep -v linkonce | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xstatnoWeak | grep internal | wc -l | grep 1
+// RUN:   grep xstatnoWeak | grep internal | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep declare | \
 // RUN:   grep xextnoWeak | grep -v internal | grep -v weak | \
-// RUN:   grep -v linkonce | wc -l | grep 1
+// RUN:   grep -v linkonce | count 1
 inline int xglobWeak(int) __attribute__((weak));
 inline int xglobWeak (int i) {
   return i*2;
diff --git a/test/CFrontend/2007-04-11-InlineStorageClassC99.c b/test/CFrontend/2007-04-11-InlineStorageClassC99.c
index 2f09268..f6193aa 100644
--- a/test/CFrontend/2007-04-11-InlineStorageClassC99.c
+++ b/test/CFrontend/2007-04-11-InlineStorageClassC99.c
@@ -1,19 +1,19 @@
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \
-// RUN:   grep xglobWeak | grep extern_weak | wc -l | grep 1
+// RUN:   grep xglobWeak | grep extern_weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xextWeak | grep weak | wc -l | grep 1
+// RUN:   grep xextWeak | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xWeaknoinline | grep weak | wc -l | grep 1
+// RUN:   grep xWeaknoinline | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xWeakextnoinline | grep weak | wc -l | grep 1
+// RUN:   grep xWeakextnoinline | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \
 // RUN:   grep xglobnoWeak | grep -v internal | grep -v weak | \
-// RUN:   grep -v linkonce | wc -l | grep 1
+// RUN:   grep -v linkonce | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xstatnoWeak | grep internal | wc -l | grep 1
+// RUN:   grep xstatnoWeak | grep internal | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xextnoWeak | grep -v internal | grep -v weak | \
-// RUN:   grep -v linkonce | wc -l | grep 1
+// RUN:   grep -v linkonce | count 1
 inline int xglobWeak(int) __attribute__((weak));
 inline int xglobWeak (int i) {
   return i*2;
diff --git a/test/CFrontend/2007-07-29-RestrictPtrArg.c b/test/CFrontend/2007-07-29-RestrictPtrArg.c
index be09108..d54dfbe 100644
--- a/test/CFrontend/2007-07-29-RestrictPtrArg.c
+++ b/test/CFrontend/2007-07-29-RestrictPtrArg.c
@@ -3,4 +3,4 @@
 void foo(int * __restrict myptr1, int * myptr2) {
   myptr1[0] = 0;
   myptr2[0] = 0;
-}
\ No newline at end of file
+}
diff --git a/test/CFrontend/sret.c b/test/CFrontend/sret.c
index 5324cae..9e34d75 100644
--- a/test/CFrontend/sret.c
+++ b/test/CFrontend/sret.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep sret | wc -l | grep 5
+// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep sret | count 5
 
 struct abc {
  int a;