Convert all tests using TCL-style quoting to use shell-style quoting.

This was done through the aid of a terrible Perl creation. I will not
paste any of the horrors here. Suffice to say, it require multiple
staged rounds of replacements, state carried between, and a few
nested-construct-parsing hacks that I'm not proud of. It happens, by
luck, to be able to deal with all the TCL-quoting patterns in evidence
in the LLVM test suite.

If anyone is maintaining large out-of-tree test trees, feel free to poke
me and I'll send you the steps I used to convert things, as well as
answer any painful questions etc. IRC works best for this type of thing
I find.

Once converted, switch the LLVM lit config to use ShTests the same as
Clang. In addition to being able to delete large amounts of Python code
from 'lit', this will also simplify the entire test suite and some of
lit's architecture.

Finally, the test suite runs 33% faster on Linux now. ;]
For my 16-hardware-thread (2x 4-core xeon e5520): 36s -> 24s

llvm-svn: 159525

27 files changed, 68 insertions, 68 deletions

diff --git a/llvm/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll b/llvm/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
index 5d1df468a66..43736601fe2 100644
--- a/llvm/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
+++ b/llvm/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
@@ -1,7 +1,7 @@
 ; This function should have exactly one call to fixdfdi, no more!
 
 ; RUN: llc < %s -march=ppc32 -mattr=-64bit | \
-; RUN:    grep {bl .*fixdfdi} | count 1
+; RUN:    grep "bl .*fixdfdi" | count 1
 
 define double @test2(double %tmp.7705) {
         %mem_tmp.2.0.in = fptosi double %tmp.7705 to i64                ; <i64> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll b/llvm/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll
index 969772ee2be..7e845382a8e 100644
--- a/llvm/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll
+++ b/llvm/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mcpu=g5 | \
-; RUN:   grep {vspltish v.*, 10}
+; RUN:   grep "vspltish v.*, 10"
 
 define void @test(<8 x i16>* %P) {
         %tmp = load <8 x i16>* %P               ; <<8 x i16>> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll b/llvm/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll
index 86fd9475029..73736c57fea 100644
--- a/llvm/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll
+++ b/llvm/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep {foo r3, r4}
-; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep {bari r3, 47}
+; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep "foo r3, r4"
+; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep "bari r3, 47"
 
 ; PR1351
 
diff --git a/llvm/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll b/llvm/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll
index 72e93a9cced..b85792c6f4f 100644
--- a/llvm/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll
+++ b/llvm/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll
@@ -1,7 +1,7 @@
 target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "powerpc-apple-darwin8.8.0"
 
-; RUN: llc < %s -march=ppc32 | grep {rlwinm r3, r3, 23, 30, 30}
+; RUN: llc < %s -march=ppc32 | grep "rlwinm r3, r3, 23, 30, 30"
 ; PR1473
 
 define zeroext i8 @foo(i16 zeroext  %a)   {
diff --git a/llvm/test/CodeGen/PowerPC/Frames-leaf.ll b/llvm/test/CodeGen/PowerPC/Frames-leaf.ll
index c2e1d6bddc5..7b1c464f9e7 100644
--- a/llvm/test/CodeGen/PowerPC/Frames-leaf.ll
+++ b/llvm/test/CodeGen/PowerPC/Frames-leaf.ll
@@ -1,35 +1,35 @@
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {stw r31, 20(r1)}
+; RUN:   not grep "stw r31, 20(r1)"
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {stwu r1, -.*(r1)}
+; RUN:   not grep "stwu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {lwz r31, 20(r1)}
+; RUN:   not grep "lwz r31, 20(r1)"
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {stw r31, 20(r1)}
+; RUN:   not grep "stw r31, 20(r1)"
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {stwu r1, -.*(r1)}
+; RUN:   not grep "stwu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {lwz r31, 20(r1)}
+; RUN:   not grep "lwz r31, 20(r1)"
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {std r31, 40(r1)}
+; RUN:   not grep "std r31, 40(r1)"
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {stdu r1, -.*(r1)}
+; RUN:   not grep "stdu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {ld r31, 40(r1)}
+; RUN:   not grep "ld r31, 40(r1)"
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {stw r31, 40(r1)}
+; RUN:   not grep "stw r31, 40(r1)"
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {stdu r1, -.*(r1)}
+; RUN:   not grep "stdu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {ld r31, 40(r1)}
+; RUN:   not grep "ld r31, 40(r1)"
 
 define i32* @f1() {
         %tmp = alloca i32, i32 2                ; <i32*> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/Frames-small.ll b/llvm/test/CodeGen/PowerPC/Frames-small.ll
index ecd5ecd2eca..0f6bd1021f8 100644
--- a/llvm/test/CodeGen/PowerPC/Frames-small.ll
+++ b/llvm/test/CodeGen/PowerPC/Frames-small.ll
@@ -1,26 +1,26 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -o %t1
-; RUN: not grep {stw r31, -4(r1)} %t1
-; RUN: grep {stwu r1, -16448(r1)} %t1
-; RUN: grep {addi r1, r1, 16448} %t1
+; RUN: not grep "stw r31, -4(r1)" %t1
+; RUN: grep "stwu r1, -16448(r1)" %t1
+; RUN: grep "addi r1, r1, 16448" %t1
 ; RUN: llc < %s -march=ppc32 | \
-; RUN: not grep {lwz r31, -4(r1)}
+; RUN: not grep "lwz r31, -4(r1)"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -disable-fp-elim \
 ; RUN:   -o %t2
-; RUN: grep {stw r31, -4(r1)} %t2
-; RUN: grep {stwu r1, -16448(r1)} %t2
-; RUN: grep {addi r1, r1, 16448} %t2
-; RUN: grep {lwz r31, -4(r1)} %t2
+; RUN: grep "stw r31, -4(r1)" %t2
+; RUN: grep "stwu r1, -16448(r1)" %t2
+; RUN: grep "addi r1, r1, 16448" %t2
+; RUN: grep "lwz r31, -4(r1)" %t2
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin8 -o %t3
-; RUN: not grep {std r31, -8(r1)} %t3
-; RUN: grep {stdu r1, -16496(r1)} %t3
-; RUN: grep {addi r1, r1, 16496} %t3
-; RUN: not grep {ld r31, -8(r1)} %t3
+; RUN: not grep "std r31, -8(r1)" %t3
+; RUN: grep "stdu r1, -16496(r1)" %t3
+; RUN: grep "addi r1, r1, 16496" %t3
+; RUN: not grep "ld r31, -8(r1)" %t3
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin8 -disable-fp-elim \
 ; RUN:   -o %t4
-; RUN: grep {std r31, -8(r1)} %t4
-; RUN: grep {stdu r1, -16512(r1)} %t4
-; RUN: grep {addi r1, r1, 16512} %t4
-; RUN: grep {ld r31, -8(r1)} %t4
+; RUN: grep "std r31, -8(r1)" %t4
+; RUN: grep "stdu r1, -16512(r1)" %t4
+; RUN: grep "addi r1, r1, 16512" %t4
+; RUN: grep "ld r31, -8(r1)" %t4
 
 define i32* @f1() {
         %tmp = alloca i32, i32 4095             ; <i32*> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll b/llvm/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll
index 7b0d69cb3be..6f985c819fb 100644
--- a/llvm/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll
+++ b/llvm/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll
@@ -1,9 +1,9 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin | \
-; RUN:   grep {stw r4, 32751}
+; RUN:   grep "stw r4, 32751"
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin | \
-; RUN:   grep {stw r4, 32751}
+; RUN:   grep "stw r4, 32751"
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin | \
-; RUN:   grep {std r4, 9024}
+; RUN:   grep "std r4, 9024"
 
 define void @test() nounwind {
 	store i32 0, i32* inttoptr (i64 48725999 to i32*)
diff --git a/llvm/test/CodeGen/PowerPC/and-imm.ll b/llvm/test/CodeGen/PowerPC/and-imm.ll
index 64a45e50c0a..6fd484b40b6 100644
--- a/llvm/test/CodeGen/PowerPC/and-imm.ll
+++ b/llvm/test/CodeGen/PowerPC/and-imm.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 | not grep {ori\\|lis}
+; RUN: llc < %s -march=ppc32 | not grep "ori\|lis"
 
 ; andi. r3, r3, 32769	
 define i32 @test(i32 %X) {
diff --git a/llvm/test/CodeGen/PowerPC/big-endian-actual-args.ll b/llvm/test/CodeGen/PowerPC/big-endian-actual-args.ll
index 009f46811e7..898ad7cb857 100644
--- a/llvm/test/CodeGen/PowerPC/big-endian-actual-args.ll
+++ b/llvm/test/CodeGen/PowerPC/big-endian-actual-args.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {addc 4, 4, 6}
+; RUN:   grep "addc 4, 4, 6"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {adde 3, 3, 5}
+; RUN:   grep "adde 3, 3, 5"
 
 define i64 @foo(i64 %x, i64 %y) {
   %z = add i64 %x, %y
diff --git a/llvm/test/CodeGen/PowerPC/big-endian-call-result.ll b/llvm/test/CodeGen/PowerPC/big-endian-call-result.ll
index fe85404cb94..760833ce20f 100644
--- a/llvm/test/CodeGen/PowerPC/big-endian-call-result.ll
+++ b/llvm/test/CodeGen/PowerPC/big-endian-call-result.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {addic 4, 4, 1}
+; RUN:   grep "addic 4, 4, 1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {addze 3, 3}
+; RUN:   grep "addze 3, 3"
 
 declare i64 @foo()
 
diff --git a/llvm/test/CodeGen/PowerPC/branch-opt.ll b/llvm/test/CodeGen/PowerPC/branch-opt.ll
index cc02e406aa6..dda1538f1cd 100644
--- a/llvm/test/CodeGen/PowerPC/branch-opt.ll
+++ b/llvm/test/CodeGen/PowerPC/branch-opt.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {b LBB.*} | count 4
+; RUN:   grep "b LBB.*" | count 4
 
 target datalayout = "E-p:32:32"
 target triple = "powerpc-apple-darwin8.7.0"
diff --git a/llvm/test/CodeGen/PowerPC/calls.ll b/llvm/test/CodeGen/PowerPC/calls.ll
index 29bcb208118..dcdda572146 100644
--- a/llvm/test/CodeGen/PowerPC/calls.ll
+++ b/llvm/test/CodeGen/PowerPC/calls.ll
@@ -1,11 +1,11 @@
 ; Test various forms of calls.
 
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {bl } | count 1
+; RUN:   grep "bl " | count 1
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {bctrl} | count 1
+; RUN:   grep "bctrl" | count 1
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {bla } | count 1
+; RUN:   grep "bla " | count 1
 
 declare void @foo()
 
diff --git a/llvm/test/CodeGen/PowerPC/compare-simm.ll b/llvm/test/CodeGen/PowerPC/compare-simm.ll
index 92d1dbe902a..94c5c0290f5 100644
--- a/llvm/test/CodeGen/PowerPC/compare-simm.ll
+++ b/llvm/test/CodeGen/PowerPC/compare-simm.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
-; RUN:   grep {cmpwi cr0, r3, -1}
+; RUN:   grep "cmpwi cr0, r3, -1"
 
 define i32 @test(i32 %x) nounwind {
         %c = icmp eq i32 %x, -1
diff --git a/llvm/test/CodeGen/PowerPC/constants.ll b/llvm/test/CodeGen/PowerPC/constants.ll
index 8901e02d3b8..9efca916d69 100644
--- a/llvm/test/CodeGen/PowerPC/constants.ll
+++ b/llvm/test/CodeGen/PowerPC/constants.ll
@@ -4,7 +4,7 @@
 ; RUN: llc < %s -march=ppc32 | \
 ; RUN:   grep ori | count 3
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {li } | count 4
+; RUN:   grep "li " | count 4
 
 define i32 @f1() {
 entry:
diff --git a/llvm/test/CodeGen/PowerPC/darwin-labels.ll b/llvm/test/CodeGen/PowerPC/darwin-labels.ll
index af233697403..56f7782138a 100644
--- a/llvm/test/CodeGen/PowerPC/darwin-labels.ll
+++ b/llvm/test/CodeGen/PowerPC/darwin-labels.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {foo bar":}
+; RUN: llc < %s | grep 'foo bar":'
 
 target datalayout = "E-p:32:32"
 target triple = "powerpc-apple-darwin8.2.0"
diff --git a/llvm/test/CodeGen/PowerPC/fabs.ll b/llvm/test/CodeGen/PowerPC/fabs.ll
index 6ef740f835c..156e00b4e57 100644
--- a/llvm/test/CodeGen/PowerPC/fabs.ll
+++ b/llvm/test/CodeGen/PowerPC/fabs.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin | grep {fabs f1, f1}
+; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin | grep "fabs f1, f1"
 
 define double @fabs(double %f) {
 entry:
diff --git a/llvm/test/CodeGen/PowerPC/fma.ll b/llvm/test/CodeGen/PowerPC/fma.ll
index 48d9eb93c31..27496f7937e 100644
--- a/llvm/test/CodeGen/PowerPC/fma.ll
+++ b/llvm/test/CodeGen/PowerPC/fma.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -fp-contract=fast | \
-; RUN:   egrep {fn?madd|fn?msub} | count 8
+; RUN:   egrep "fn?madd|fn?msub" | count 8
 
 define double @test_FMADD1(double %A, double %B, double %C) {
 	%D = fmul double %A, %B		; <double> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/fsqrt.ll b/llvm/test/CodeGen/PowerPC/fsqrt.ll
index 74a8725eb12..bf8c4a22c95 100644
--- a/llvm/test/CodeGen/PowerPC/fsqrt.ll
+++ b/llvm/test/CodeGen/PowerPC/fsqrt.ll
@@ -2,13 +2,13 @@
 ; otherwise.
 
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=+fsqrt | \
-; RUN:   grep {fsqrt f1, f1}
+; RUN:   grep "fsqrt f1, f1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mcpu=g5 | \
-; RUN:   grep {fsqrt f1, f1}
+; RUN:   grep "fsqrt f1, f1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=-fsqrt | \
-; RUN:   not grep {fsqrt f1, f1}
+; RUN:   not grep "fsqrt f1, f1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mcpu=g4 | \
-; RUN:   not grep {fsqrt f1, f1}
+; RUN:   not grep "fsqrt f1, f1"
 
 declare double @llvm.sqrt.f64(double)
 
diff --git a/llvm/test/CodeGen/PowerPC/iabs.ll b/llvm/test/CodeGen/PowerPC/iabs.ll
index a43f09c7d56..595e3556531 100644
--- a/llvm/test/CodeGen/PowerPC/iabs.ll
+++ b/llvm/test/CodeGen/PowerPC/iabs.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -stats |& \
-; RUN:   grep {4 .*Number of machine instrs printed}
+; RUN:   grep "4 .*Number of machine instrs printed"
 
 ;; Integer absolute value, should produce something as good as:
 ;;      srawi r2, r3, 31
diff --git a/llvm/test/CodeGen/PowerPC/ispositive.ll b/llvm/test/CodeGen/PowerPC/ispositive.ll
index 4161e3438a4..78cdf4a4d90 100644
--- a/llvm/test/CodeGen/PowerPC/ispositive.ll
+++ b/llvm/test/CodeGen/PowerPC/ispositive.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
-; RUN:   grep {srwi r3, r3, 31}
+; RUN:   grep "srwi r3, r3, 31"
 
 define i32 @test1(i32 %X) {
 entry:
diff --git a/llvm/test/CodeGen/PowerPC/no-dead-strip.ll b/llvm/test/CodeGen/PowerPC/no-dead-strip.ll
index 34594132530..6320e2812c1 100644
--- a/llvm/test/CodeGen/PowerPC/no-dead-strip.ll
+++ b/llvm/test/CodeGen/PowerPC/no-dead-strip.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {no_dead_strip.*_X}
+; RUN: llc < %s | grep "no_dead_strip.*_X"
 
 target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "powerpc-apple-darwin8.8.0"
diff --git a/llvm/test/CodeGen/PowerPC/retaddr.ll b/llvm/test/CodeGen/PowerPC/retaddr.ll
index cf16b4c26f6..c931dfe9357 100644
--- a/llvm/test/CodeGen/PowerPC/retaddr.ll
+++ b/llvm/test/CodeGen/PowerPC/retaddr.ll
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=ppc32 | grep mflr
 ; RUN: llc < %s -march=ppc32 | grep lwz
-; RUN: llc < %s -march=ppc64 | grep {ld r., 16(r1)}
+; RUN: llc < %s -march=ppc64 | grep "ld r., 16(r1)"
 
 target triple = "powerpc-apple-darwin8"
 
diff --git a/llvm/test/CodeGen/PowerPC/rlwimi3.ll b/llvm/test/CodeGen/PowerPC/rlwimi3.ll
index 05d37bf1625..afeba49de94 100644
--- a/llvm/test/CodeGen/PowerPC/rlwimi3.ll
+++ b/llvm/test/CodeGen/PowerPC/rlwimi3.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -stats |& \
-; RUN:   grep {Number of machine instrs printed} | grep 12
+; RUN:   grep "Number of machine instrs printed" | grep 12
 
 define i16 @Trans16Bit(i32 %srcA, i32 %srcB, i32 %alpha) {
 	%tmp1 = shl i32 %srcA, 15		; <i32> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/seteq-0.ll b/llvm/test/CodeGen/PowerPC/seteq-0.ll
index 688b29aa124..731958374ee 100644
--- a/llvm/test/CodeGen/PowerPC/seteq-0.ll
+++ b/llvm/test/CodeGen/PowerPC/seteq-0.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
-; RUN:   grep {srwi r., r., 5}
+; RUN:   grep "srwi r., r., 5"
 
 define i32 @eq0(i32 %a) {
         %tmp.1 = icmp eq i32 %a, 0              ; <i1> [#uses=1]
diff --git a/llvm/test/CodeGen/PowerPC/small-arguments.ll b/llvm/test/CodeGen/PowerPC/small-arguments.ll
index b4767b0a291..19ca0985eef 100644
--- a/llvm/test/CodeGen/PowerPC/small-arguments.ll
+++ b/llvm/test/CodeGen/PowerPC/small-arguments.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 | not grep {extsh\\|rlwinm}
+; RUN: llc < %s -march=ppc32 | not grep "extsh\|rlwinm"
 
 declare signext i16 @foo()  
 
diff --git a/llvm/test/CodeGen/PowerPC/stack-protector.ll b/llvm/test/CodeGen/PowerPC/stack-protector.ll
index 20203612502..810630f6978 100644
--- a/llvm/test/CodeGen/PowerPC/stack-protector.ll
+++ b/llvm/test/CodeGen/PowerPC/stack-protector.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=ppc32 < %s -o - | grep {__stack_chk_guard}
-; RUN: llc -march=ppc32 < %s -o - | grep {__stack_chk_fail}
+; RUN: llc -march=ppc32 < %s -o - | grep "__stack_chk_guard"
+; RUN: llc -march=ppc32 < %s -o - | grep "__stack_chk_fail"
 
 @"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00"		; <[11 x i8]*> [#uses=1]
 
diff --git a/llvm/test/CodeGen/PowerPC/trampoline.ll b/llvm/test/CodeGen/PowerPC/trampoline.ll
index 91b201146b6..3ea46f50e0c 100644
--- a/llvm/test/CodeGen/PowerPC/trampoline.ll
+++ b/llvm/test/CodeGen/PowerPC/trampoline.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 | grep {__trampoline_setup}
+; RUN: llc < %s -march=ppc32 | grep "__trampoline_setup"
 
 module asm "\09.lazy_reference .objc_class_name_NSImageRep"
 module asm "\09.objc_class_name_NSBitmapImageRep=0"