5 files changed, 8 insertions, 8 deletions
diff --git a/llvm/test/Transforms/Reassociate/basictest3.ll b/llvm/test/Transforms/Reassociate/basictest3.ll
index a3da5a0400a..4aa134ae7fb 100644
--- a/llvm/test/Transforms/Reassociate/basictest3.ll
+++ b/llvm/test/Transforms/Reassociate/basictest3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse | llvm-dis | grep add | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse | llvm-dis | grep add | count 6
 ; Each of these functions should turn into two adds each.
 
 %e = external global int
diff --git a/llvm/test/Transforms/Reassociate/mul-factor3.ll b/llvm/test/Transforms/Reassociate/mul-factor3.ll
index 1272ff62dd8..c6aeedefcf4 100644
--- a/llvm/test/Transforms/Reassociate/mul-factor3.ll
+++ b/llvm/test/Transforms/Reassociate/mul-factor3.ll
@@ -2,8 +2,8 @@
 
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -reassociate -instcombine | llvm-dis > %t 
-; RUN: grep mul %t | wc -l | grep 2
-; RUN: grep add %t | wc -l | grep 1
+; RUN: grep mul %t | count 2
+; RUN: grep add %t | count 1
 
 int %test(int %A, int %B, int %C) {
 	%aa = mul int %A, %A
diff --git a/llvm/test/Transforms/Reassociate/mulfactor.ll b/llvm/test/Transforms/Reassociate/mulfactor.ll
index bb7efc3f7a2..91667a4c54b 100644
--- a/llvm/test/Transforms/Reassociate/mulfactor.ll
+++ b/llvm/test/Transforms/Reassociate/mulfactor.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | count 2
 
 ; This should have exactly 2 multiplies when we're done.
 
diff --git a/llvm/test/Transforms/Reassociate/mulfactor2.ll b/llvm/test/Transforms/Reassociate/mulfactor2.ll
index dd1e8ae8a35..61c9f0444ac 100644
--- a/llvm/test/Transforms/Reassociate/mulfactor2.ll
+++ b/llvm/test/Transforms/Reassociate/mulfactor2.ll
@@ -2,8 +2,8 @@
 
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -instcombine -reassociate -instcombine | llvm-dis -o %t 
-; RUN: grep mul %t | wc -l | grep 1
-; RUN: grep add %t | wc -l | grep 1
+; RUN: grep mul %t | count 1
+; RUN: grep add %t | count 1
 
 int %main(int %t) {
         %tmp.3 = mul int %t, 12         ; <int> [#uses=1]
diff --git a/llvm/test/Transforms/Reassociate/shift-factor.ll b/llvm/test/Transforms/Reassociate/shift-factor.ll
index ed8ed392c5f..b381d45f798 100644
--- a/llvm/test/Transforms/Reassociate/shift-factor.ll
+++ b/llvm/test/Transforms/Reassociate/shift-factor.ll
@@ -1,8 +1,8 @@
 ; There should be exactly one shift and one add left.
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -reassociate -instcombine | llvm-dis > %t  
-; RUN: grep shl %t | wc -l | grep 1
-; RUN: grep add %t | wc -l | grep 1
+; RUN: grep shl %t | count 1
+; RUN: grep add %t | count 1
 
 int %test(int %X, int %Y) {
         %tmp.2 = shl int %X, ubyte 1            ; <int> [#uses=1]