4 files changed, 9 insertions, 9 deletions
diff --git a/test/CodeGen/ARM/aliases.ll b/test/CodeGen/ARM/aliases.ll
index bd7555a..70b2c4d 100644
--- a/test/CodeGen/ARM/aliases.ll
+++ b/test/CodeGen/ARM/aliases.ll
@@ -1,8 +1,8 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=arm-linux-gnueabi -o %t -f
-; RUN: grep -c set %t   | grep 5
-; RUN: grep -c globl %t | grep 4
-; RUN: grep -c weak %t  | grep 1
+; RUN: grep set %t   | count 5
+; RUN: grep globl %t | count 4
+; RUN: grep weak %t  | count 1
 
 @bar = external global i32
 @foo1 = alias i32* @bar
diff --git a/test/CodeGen/ARM/unaligned_load_store.ll b/test/CodeGen/ARM/unaligned_load_store.ll
index 211d748..dad1897 100644
--- a/test/CodeGen/ARM/unaligned_load_store.ll
+++ b/test/CodeGen/ARM/unaligned_load_store.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -o %t -f
-; RUN: grep -c ldrb %t | grep 4
-; RUN: grep -c strb %t | grep 4
+; RUN: grep ldrb %t | count 4
+; RUN: grep strb %t | count 4
 
 
 	%struct.p = type <{ i8, i32 }>
diff --git a/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll b/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll
index f891599..16d7a16 100644
--- a/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll
+++ b/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep -c je | grep 3
+; RUN: llvm-as < %s | llc -march=x86 | grep je | count 3
 ; RUN: llvm-as < %s | llc -march=x86-64 | grep 4297064449
 ; PR 1325+
 
diff --git a/test/CodeGen/X86/aliases.ll b/test/CodeGen/X86/aliases.ll
index 9bd6140..4a69eae 100644
--- a/test/CodeGen/X86/aliases.ll
+++ b/test/CodeGen/X86/aliases.ll
@@ -1,8 +1,8 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=i686-pc-linux-gnu -o %t -f
-; RUN: grep -c set %t   | grep 5
-; RUN: grep -c globl %t | grep 4
-; RUN: grep -c weak %t  | grep 1
+; RUN: grep set %t   | count 5
+; RUN: grep globl %t | count 4
+; RUN: grep weak %t  | count 1
 
 @bar = external global i32
 @foo1 = alias i32* @bar