For PR1319:

Fix syntax of tests to ensure grep pattern is properly quoted.

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

diff --git a/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll b/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
index d7ae66ee9f5e44448d032f31abd8420e3ef43e49..f29e9a0e8bb3f856c55b359d8a1c2ccf1a918f0c 100644 (file)
--- a/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
+++ b/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
-; RUN:   opt -aa-eval -disable-output |& grep '2 no alias respon'
+; RUN:   opt -aa-eval -disable-output |& grep {2 no alias respon}
 
 ;; TEST that A[1][0] may alias A[0][i].
 

diff --git a/test/Assembler/2002-07-25-ParserAssertionFailure.llx b/test/Assembler/2002-07-25-ParserAssertionFailure.llx
index 214538384ff520c11625c61f1909bcfa3c33eb5e..ccfc380b75bf7c98da5d1acfef7fc1bcb99ac3f9 100644 (file)
--- a/test/Assembler/2002-07-25-ParserAssertionFailure.llx
+++ b/test/Assembler/2002-07-25-ParserAssertionFailure.llx
@@ -1,6 +1,6 @@
 ; Make sure we don't get an assertion failure, even though this is a parse 
 ; error
-; RUN: llvm-as < %s -o /dev/null -f |& grep 'No arguments'
+; RUN: llvm-as < %s -o /dev/null -f |& grep {No arguments}
 
 %ty = type void (i32)
 

diff --git a/test/Assembler/2003-04-15-ConstantInitAssertion.llx b/test/Assembler/2003-04-15-ConstantInitAssertion.llx
index b2c6f8a5f4716f79bba71fb553fc2ff9dac07c1e..58b8bcaca146e63f2415cbaec652cb502516186e 100644 (file)
--- a/test/Assembler/2003-04-15-ConstantInitAssertion.llx
+++ b/test/Assembler/2003-04-15-ConstantInitAssertion.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s >/dev/null |& grep "Expected type 'i32' for element #0"
+; RUN: llvm-as < %s >/dev/null |& grep {Expected type 'i32' for element #0}
 ; Test the case of a misformed constant initializer
 ; This should cause an assembler error, not an assertion failure!
 constant { i32 } { float 1.0 }

diff --git a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
index 2cf1e56a361ef13e34f8ec3ee2603777808cbbb4..cffee6dda387f205d955e7cd1658d5a02572beb4 100644 (file)
--- a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
+++ b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f |& grep 'Undefined type remains'
+; RUN: llvm-as < %s -o /dev/null -f |& grep {Undefined type remains}
 ; END.
 
 @d_reduction_0_dparser_gram = global { 

diff --git a/test/Assembler/ConstantExprFold.llx b/test/Assembler/ConstantExprFold.llx
index c9c3dff9459c5a0506a0afa315871ae419686e08..b4d779d79464e7aa67d9cec1db2bd7f5562ad582 100644 (file)
--- a/test/Assembler/ConstantExprFold.llx
+++ b/test/Assembler/ConstantExprFold.llx
@@ -1,8 +1,7 @@
 ; This test checks to make sure that constant exprs fold in some simple 
 ; situations
 
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep '(' &&
-; RUN: llvm-upgrade < %s | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep {(}
 
 %A = global long 0
 

diff --git a/test/C++Frontend/2005-01-03-StaticInitializers.cpp b/test/C++Frontend/2005-01-03-StaticInitializers.cpp
index 27da715c1479db568fb3e17d7257d685cea5973e..0791d9fd83f8b9b80d2e9333a556d4da4e904ab9 100644 (file)
--- a/test/C++Frontend/2005-01-03-StaticInitializers.cpp
+++ b/test/C++Frontend/2005-01-03-StaticInitializers.cpp
@@ -1,4 +1,4 @@
-// RUN: %llvmgxx %s -S -o - | not grep 'llvm.global_ctor'
+// RUN: %llvmgxx %s -S -o - | not grep llvm.global_ctor
 
 struct S {
   int  A[2];

diff --git a/test/C++Frontend/2007-01-06-ELF-Thunk-Sections.cpp b/test/C++Frontend/2007-01-06-ELF-Thunk-Sections.cpp
index b1fb0dbd6b15b953855fc04fb0433bdc4a34463e..654e11be1ffcc7752fe97183faa57715c5db066d 100644 (file)
--- a/test/C++Frontend/2007-01-06-ELF-Thunk-Sections.cpp
+++ b/test/C++Frontend/2007-01-06-ELF-Thunk-Sections.cpp
@@ -1,5 +1,4 @@
-// RUN: %llvmgxx %s -emit-llvm -S -o - &&
-// RUN: %llvmgxx %s -emit-llvm -S -o - | not grep 'gnu.linkonce.'
+// RUN: %llvmgxx %s -emit-llvm -S -o - | not grep gnu.linkonce.
 // PR1085
 
 class 

diff --git a/test/CFrontend/2003-11-19-AddressOfRegister.c.tr b/test/CFrontend/2003-11-19-AddressOfRegister.c.tr
index 30cac7ba8e9bb8a7c34eb17c354abe4934e71ae4..69dc54d9289cce596826a98c0a26d06207d927eb 100644 (file)
--- a/test/CFrontend/2003-11-19-AddressOfRegister.c.tr
+++ b/test/CFrontend/2003-11-19-AddressOfRegister.c.tr
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc %s -S -o /dev/null |& not grep 'warning'
+// RUN: %llvmgcc -xc %s -S -o /dev/null |& not grep warning
 
 struct item {
   short delta[4];

diff --git a/test/CFrontend/2005-05-06-CountBuiltins.c b/test/CFrontend/2005-05-06-CountBuiltins.c
index cfc691a670b54a2d77492ea4f220288c0a4aedf3..da40a142ae90b98e0737ddf0bfbdf34203fd633c 100644 (file)
--- a/test/CFrontend/2005-05-06-CountBuiltins.c
+++ b/test/CFrontend/2005-05-06-CountBuiltins.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o - | llvm-as | llvm-dis | not grep 'call.*__builtin'
+// RUN: %llvmgcc %s -S -o - | llvm-as | llvm-dis | not grep call.*__builtin
 
 int G, H, I;
 void foo(int P) {

diff --git a/test/CodeGen/Alpha/ctpop.ll b/test/CodeGen/Alpha/ctpop.ll
index fa84cb706b93d72f245fb54f2a3d8522d9376433..6405224117b31730a8602af4e016ebaa7dc636c5 100644 (file)
--- a/test/CodeGen/Alpha/ctpop.ll
+++ b/test/CodeGen/Alpha/ctpop.ll
@@ -7,7 +7,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mcpu=ev56 | \
 ; RUN:   not grep -i ctpop
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha -mattr=-CIX | \
-; RUN:   not grep -i 'ctpop'
+; RUN:   not grep -i ctpop
 ; XFAIL: *
 
 declare long %llvm.ctpop.i64(long)

diff --git a/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll b/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll
index 6a55db8617c7c78681b493fedcd7d36e701574a5..a285daeab2241ebfdfff5f7df2aa8466e49f5633 100644 (file)
--- a/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll
+++ b/test/CodeGen/CBackend/2004-12-03-ExternStatics.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep 'extern.*msg'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep extern.*msg
 
 ; This is PR472
 

diff --git a/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll b/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll
index 2bb4233bb95e8a862f884bf3df609247a07e0aab..0f5688db372e10906185239aaa04659942f0e4a3 100644 (file)
--- a/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll
+++ b/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep '8388635'  &&
-; RUN: llvm-as < %s | llc -march=x86-64 | grep '4294981120'
+; RUN: llvm-as < %s | llc -march=x86 | grep 8388635  &&
+; RUN: llvm-as < %s | llc -march=x86-64 | grep 4294981120
 ; PR 1325
 
 ; FIXME: this is xfailed until we figure out ppc bootstrap

diff --git a/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll b/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll
index 839e88c51ef63bd151011b5d4ae835be58f259e9..87f6005a36422fc574c6cebb5388330a04f2651e 100644 (file)
--- a/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll
+++ b/test/CodeGen/PowerPC/2004-12-12-ZeroSizeCommon.ll
@@ -1,3 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep '.comm.*X,0'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep .comm.*X,0
 
 %X = linkonce global {} {}

diff --git a/test/CodeGen/PowerPC/and-imm.ll b/test/CodeGen/PowerPC/and-imm.ll
index e81f7768a6062fbf4bc04bee1dc19e369af31a32..b1d9fcbba16f33ef4980fde9dbad3568f44f556d 100644 (file)
--- a/test/CodeGen/PowerPC/and-imm.ll
+++ b/test/CodeGen/PowerPC/and-imm.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep 'ori\|lis'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep {ori\\|lis}
 
 int %test(int %X) {
        %Y = and int %X, 32769   ; andi. r3, r3, 32769

diff --git a/test/CodeGen/PowerPC/small-arguments.ll b/test/CodeGen/PowerPC/small-arguments.ll
index 3ab92d1187b1751408df26375a6673d8ce256b96..e5120473a2fc6c85e553557245a242357a66607a 100644 (file)
--- a/test/CodeGen/PowerPC/small-arguments.ll
+++ b/test/CodeGen/PowerPC/small-arguments.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 &&
-; RUN: llvm-as < %s | llc -march=ppc32 | not grep 'extsh\|rlwinm'
+; RUN: llvm-as < %s | llc -march=ppc32 | not grep {extsh\\|rlwinm}
 
 declare i16 @foo() sext 
 

diff --git a/test/CodeGen/X86/2005-01-17-CycleInDAG.ll b/test/CodeGen/X86/2005-01-17-CycleInDAG.ll
index 8dbff537f593e01ce62e2dc843587237861a7407..74233ebda05ca18ca8f7e86586187ed9ffe2da23 100644 (file)
--- a/test/CodeGen/X86/2005-01-17-CycleInDAG.ll
+++ b/test/CodeGen/X86/2005-01-17-CycleInDAG.ll
@@ -3,7 +3,7 @@
 ; is invalid code (there is no correct way to order the instruction).  Check
 ; that we do not fold the load into the sub.
 
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'sub.*GLOBAL'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep sub.*GLOBAL
 
 %GLOBAL = external global int
 

diff --git a/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll b/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll
index e87221decf51d94fc66ac116e6537b33543410d4..f5d5ec2e61576afc81a9ac81f3fd810e496f12d5 100644 (file)
--- a/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll
+++ b/test/CodeGen/X86/2005-12-03-IndirectTailCall.ll
@@ -1,5 +1,5 @@
 ; XFAIL: *
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'jmp \*ecx'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep {jmp \\*ecx}
 declare int %putchar(int)
 
 int %main(){ 

diff --git a/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll
index c9e4b0675e1c2a16928c4674fc9b96566f13cab3..b7f08cfc9ce21db1f36b3daf505b590ee2e6907b 100644 (file)
--- a/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll
+++ b/test/CodeGen/X86/2006-03-01-InstrSchedBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'subl.*%esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep {subl.*%esp}
 
 int %f(int %a, int %b) {
        %tmp.2 = mul int %a, %a

diff --git a/test/CodeGen/X86/2006-05-08-InstrSched.ll b/test/CodeGen/X86/2006-05-08-InstrSched.ll
index 8897692be2150d75ea0c79d1f38d1208c2d23e31..fd35f9f5cce7979d89f5f4db38e398714bd8e76d 100644 (file)
--- a/test/CodeGen/X86/2006-05-08-InstrSched.ll
+++ b/test/CodeGen/X86/2006-05-08-InstrSched.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static | not grep 'subl.*%esp'
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=x86 -relocation-model=static | not grep {subl.*%esp}
 
 %A = external global ushort*
 %B = external global uint

diff --git a/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll b/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll
index 43d685188ecafa43601312c0cb7c85750cbd9d25..bdef507f93c449e867dcd3c309d3c28a23aff97a 100644 (file)
--- a/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll
+++ b/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86-64 -sched=none | grep leaq &&
-; RUN: llvm-as < %s | llc -march=x86-64 -sched=none | not grep ',%rsp)'
+; RUN: llvm-as < %s | llc -march=x86-64 -sched=none | grep leaq
+; RUN: llvm-as < %s | llc -march=x86-64 -sched=none | not grep {,%rsp)}
 ; PR1103
 
 target datalayout = "e-p:64:64"

diff --git a/test/CodeGen/X86/2007-02-04-OrAddrMode.ll b/test/CodeGen/X86/2007-02-04-OrAddrMode.ll
index 05114d1bff686601b46ca847c8a5da60829cf590..cadba5b0437fd573316950301f4a678011f3f2fc 100644 (file)
--- a/test/CodeGen/X86/2007-02-04-OrAddrMode.ll
+++ b/test/CodeGen/X86/2007-02-04-OrAddrMode.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=x86 | grep {orl \$1, %eax}
-; RUN: llvm-as < %s | llc -march=x86 | grep {leal 3(,%eax,8)'
+; RUN: llvm-as < %s | llc -march=x86 | grep {leal 3(,%eax,8)}
 
 ;; This example can't fold the or into an LEA.
 define i32 @test(float ** %tmp2, i32 %tmp12) {

diff --git a/test/CodeGen/X86/overlap-add.ll b/test/CodeGen/X86/overlap-add.ll
index 354dcc6fe6f6541d71e419d19e5771e5ff9c0ff1..4eef68d3d549930a29ac1b10c367dbd2424546da 100644 (file)
--- a/test/CodeGen/X86/overlap-add.ll
+++ b/test/CodeGen/X86/overlap-add.ll
@@ -7,7 +7,7 @@
 ; Check that the shift gets turned into an LEA.
 
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
-; RUN:   not grep 'mov E.X, E.X'
+; RUN:   not grep {mov E.X, E.X}
 
 ; FIXME: We need live variable information about flags to do this xform safely. :(
 ; XFAIL: *

diff --git a/test/CodeGen/X86/setuge.ll b/test/CodeGen/X86/setuge.ll
index 0cdade2710d7ae23155c511239615be06e743bfd..2960c6b4d1e194886197f6e7cef0719367df2cf0 100644 (file)
--- a/test/CodeGen/X86/setuge.ll
+++ b/test/CodeGen/X86/setuge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'set'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep set
 
 declare bool %llvm.isunordered.f32(float, float)
 

diff --git a/test/CodeGen/X86/shift-one.ll b/test/CodeGen/X86/shift-one.ll
index a91cbbc50300af0a10be1f173f233f580c7ae3ef..3108fba0f4dcf2ad4a88aa12173e962ad3f4e1be 100644 (file)
--- a/test/CodeGen/X86/shift-one.ll
+++ b/test/CodeGen/X86/shift-one.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep 'leal'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep leal
 
 %x = external global int
 

diff --git a/test/CodeGen/X86/trunc-to-bool.ll b/test/CodeGen/X86/trunc-to-bool.ll
index 667fc2f3d3c8082d84fd479bcab353b6942de54d..bf5382510c29ac399cc5445ac1c51c49d5b14a83 100644 (file)
--- a/test/CodeGen/X86/trunc-to-bool.ll
+++ b/test/CodeGen/X86/trunc-to-bool.ll
@@ -1,8 +1,7 @@
 ; An integer truncation to i1 should be done with an and instruction to make
 ; sure only the LSBit survives. Test that this is the case both for a returned
 ; value and as the operand of a branch.
-; RUN: llvm-as < %s | llc -march=x86 &&
-; RUN: llvm-as < %s | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | \
+; RUN: llvm-as < %s | llc -march=x86 | grep {\\(and\\)\\|\\(test.*\\\$1\\)} | \
 ; RUN:   wc -l | grep 6
 
 define i1 @test1(i32 %X) zext {

diff --git a/test/CodeGen/X86/vec_shuffle-10.ll b/test/CodeGen/X86/vec_shuffle-10.ll
index ccd1911417429b92a21f5d0cce645018cf86e218..34a97c4ffde35aa6e7b8a33eb60f6817d0914794 100644 (file)
--- a/test/CodeGen/X86/vec_shuffle-10.ll
+++ b/test/CodeGen/X86/vec_shuffle-10.ll
@@ -1,7 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpcklps | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep unpckhps | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | not grep 'sub.*esp'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
+; RUN:   grep unpcklps | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
+; RUN:   grep unpckhps | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
+; RUN:   not grep {sub.*esp}
 
 void %test(<4 x float>* %res, <4 x float>* %A, <4 x float>* %B) {
         %tmp = load <4 x float>* %B             ; <<4 x float>> [#uses=2]

diff --git a/test/TableGen/DagDefSubst.ll b/test/TableGen/DagDefSubst.ll
index a9cd59b9afbc5f32ee0b359168fa5699d5049ff1..e5eebe99e8c1c358dcc48ca106843f6b72aa6619 100644 (file)
--- a/test/TableGen/DagDefSubst.ll
+++ b/test/TableGen/DagDefSubst.ll
@@ -1,5 +1,5 @@
-// RUN: tblgen %s | grep 'dag d = (X Y)' &&
-// RUN: tblgen %s | grep 'dag e = (Y X)'
+// RUN: tblgen %s | grep {dag d = (X Y)}
+// RUN: tblgen %s | grep {dag e = (Y X)}
 def X;
 
 class yclass;

diff --git a/test/TableGen/DagIntSubst.ll b/test/TableGen/DagIntSubst.ll
index b9522f1f57ffb7e95f6924c0f36da402c250deda..3c1291c3eca6e653384164dc1f4c42ee6ccf1475 100644 (file)
--- a/test/TableGen/DagIntSubst.ll
+++ b/test/TableGen/DagIntSubst.ll
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep 'dag d = (X 13)'
+// RUN: tblgen %s | grep {dag d = (X 13)}
 def X;
 
 class C<int N> {

diff --git a/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll b/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
index 6b6b340097dc6eda315b7cd2b93dd7acaf25f6dc..cf44346965798546f7fcca169693199718c4f58c 100644 (file)
--- a/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
+++ b/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll
@@ -1,6 +1,7 @@
 ; SetCC on boolean values was not implemented!
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not grep 'set'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | \
+; RUN:   not grep set
 
 bool "test1"() {
        %A = setle bool true, false

diff --git a/test/Transforms/ConstProp/logicaltest.ll b/test/Transforms/ConstProp/logicaltest.ll
index dfd45869b2aabedfb853decf764629e6fd89f103..ce311146d0a392ef29c4f7c363c656d5504502e6 100644 (file)
--- a/test/Transforms/ConstProp/logicaltest.ll
+++ b/test/Transforms/ConstProp/logicaltest.ll
@@ -1,6 +1,7 @@
 ; Ensure constant propogation of logical instructions is working correctly.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | not egrep 'and|or|xor'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -die | llvm-dis | \
+; RUN:   not egrep {and|or|xor}
 
 
 int  "test1"() { %R = and int 4,1234          ret int  %R }

diff --git a/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll b/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll
index 743827df3f1df57204ce5360e12d99e0df911ef5..ba679892b6ff753e092d7ba6d7ee376c67e1b999 100644 (file)
--- a/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll
+++ b/test/Transforms/IndVarsSimplify/2003-12-10-IndVarDeadCode.ll
@@ -1,7 +1,8 @@
 ; The induction variable canonicalization pass shouldn't leave dead
 ; instructions laying around!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | not grep '#uses=0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | \
+; RUN:   not grep {#uses=0}
 
 int %mul(int %x, int %y) {
 entry:

diff --git a/test/Transforms/LoopStrengthReduce/invariant_value_first.ll b/test/Transforms/LoopStrengthReduce/invariant_value_first.ll
index 5e05e7555083cdac47fc4271b7dd90e5eeea879f..f2b75a2a13c4f17010d601d2f35665ad5d1d7155 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/invariant_value_first.ll
+++ b/test/Transforms/LoopStrengthReduce/invariant_value_first.ll
@@ -1,5 +1,6 @@
 ; Check that the index of 'P[outer]' is pulled out of the loop.
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN:   not grep {getelementptr.*%outer.*%INDVAR}
 
 declare bool %pred()
 declare int %foo()

diff --git a/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll b/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll
index 0289badddc418fdb314edb53bcb8377674fb34be..6e9051278f4e452174846cdb85e2b46874ca6ccb 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll
+++ b/test/Transforms/LoopStrengthReduce/invariant_value_first_arg.ll
@@ -1,5 +1,6 @@
 ; Check that the index of 'P[outer]' is pulled out of the loop.
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'getelementptr.*%outer.*%INDVAR'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN:   not grep {getelementptr.*%outer.*%INDVAR}
 
 declare bool %pred()
 

diff --git a/test/Transforms/LoopStrengthReduce/variable_stride.ll b/test/Transforms/LoopStrengthReduce/variable_stride.ll
index 83aeaa6a9c6c8a62db8e12a22e0d059f8d161e08..1af2a12df24247ead4b86fc116994551fb090309 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/variable_stride.ll
+++ b/test/Transforms/LoopStrengthReduce/variable_stride.ll
@@ -1,5 +1,5 @@
 ; Check that variable strides are reduced to adds instead of multiplies.
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'mul'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep mul
 
 declare bool %pred(int)
 

diff --git a/test/Transforms/Mem2Reg/PromoteMemToRegister.ll b/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
index 49de1b6bceed2431a864fa9ce7c52d5fd1c9d218..8bf7b51a39fb579ec538679f98a2e97c8529c019 100644 (file)
--- a/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
+++ b/test/Transforms/Mem2Reg/PromoteMemToRegister.ll
@@ -1,5 +1,5 @@
 ; Simple sanity check testcase.  Both alloca's should be eliminated.
-; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep 'alloca'
+; RUN: llvm-upgrade < %s | llvm-as | opt -mem2reg | llvm-dis | not grep alloca
 
 implementation
 

diff --git a/test/Transforms/Reassociate/inverses.ll b/test/Transforms/Reassociate/inverses.ll
index eff3e6b34bf56e75da8f6b7e7c6e3ee7eef482a4..e431328a4816adacc87c08162e476429fe9298b8 100644 (file)
--- a/test/Transforms/Reassociate/inverses.ll
+++ b/test/Transforms/Reassociate/inverses.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -dce | llvm-dis | not grep '\(and\|sub\)'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -dce | llvm-dis | \
+; RUN:   not grep {\\(and\\|sub\\)}
 
 int %test1(int %a, int %b) {
         %tmp.2 = and int %b, %a

diff --git a/test/Transforms/SimplifyLibCalls/FFS.ll b/test/Transforms/SimplifyLibCalls/FFS.ll
index 335274ac45dda19225e881979bc30aa719d489c8..7049b5a377acf6a1616fa5a101d18b935078fd1c 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/FFS.ll
+++ b/test/Transforms/SimplifyLibCalls/FFS.ll
@@ -1,5 +1,6 @@
 ; Test that the ToAsciiOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*%ffs'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*%ffs}
 
 declare int %ffs(int)
 declare int %ffsl(int)

diff --git a/test/Transforms/SimplifyLibCalls/FPrintF.ll b/test/Transforms/SimplifyLibCalls/FPrintF.ll
index 040052708e43408682a1fd25f7126de9efc554f2..53b751f1c1f16189ee9b2ad4ba7682bde5bd97c7 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/FPrintF.ll
+++ b/test/Transforms/SimplifyLibCalls/FPrintF.ll
@@ -1,5 +1,6 @@
 ; Test that the FPrintFOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*fprintf'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*fprintf}
 ;
 
 %struct._IO_FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct._IO_FILE*, int, int, int, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [52 x sbyte] }

diff --git a/test/Transforms/SimplifyLibCalls/MemCpy.ll b/test/Transforms/SimplifyLibCalls/MemCpy.ll
index 6cc43733a1a26f7a64d1d7154c9b304065c23b03..0a99488197bedab903dd8c208614e276ea7d4627 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/MemCpy.ll
+++ b/test/Transforms/SimplifyLibCalls/MemCpy.ll
@@ -1,6 +1,6 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memcpy.i32'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | \
+; RUN:   llvm-dis | not grep {call.*llvm.memcpy.i32}
 
 declare void %llvm.memcpy.i32(sbyte*,sbyte*,uint,uint)
 %h = constant [2 x sbyte] c"h\00"

diff --git a/test/Transforms/SimplifyLibCalls/MemMove.ll b/test/Transforms/SimplifyLibCalls/MemMove.ll
index 3e6e8bd75b4b0574ce262facf491e03a332f7b60..7c89d914a90794bb8b8507dfc7886ddd52522eb5 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/MemMove.ll
+++ b/test/Transforms/SimplifyLibCalls/MemMove.ll
@@ -1,6 +1,6 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memmove.i32'
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop -simplify-libcalls | \
+; RUN:   llvm-dis | not grep {call.*llvm.memmove.i32}
 
 declare void %llvm.memmove.i32(sbyte*,sbyte*,uint,uint)
 %h = constant [2 x sbyte] c"h\00"

diff --git a/test/Transforms/SimplifyLibCalls/Printf.ll b/test/Transforms/SimplifyLibCalls/Printf.ll
index 2a42e006ef99c84ec8bf08230ba0015093409796..c892f0341ab326e0780e7d01bc91c37f229cc9cb 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/Printf.ll
+++ b/test/Transforms/SimplifyLibCalls/Printf.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep putchar &&
-; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*printf'
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep putchar
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*printf}
 
 @str = internal constant [13 x i8] c"hello world\0A\00"         ; <[13 x i8]*> [#uses=1]
 @str1 = internal constant [2 x i8] c"h\00"              ; <[2 x i8]*> [#uses=1]

diff --git a/test/Transforms/SimplifyLibCalls/Puts.ll b/test/Transforms/SimplifyLibCalls/Puts.ll
index 4011a82fa9f4919fd5e574bbd2a3157d52c5097c..795b15cb654aab1d8c31734fab82e772540df1e1 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/Puts.ll
+++ b/test/Transforms/SimplifyLibCalls/Puts.ll
@@ -1,5 +1,6 @@
 ; Test that the PutsCatOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*fputs'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*fputs}
 ;
 %struct._IO_FILE = type { int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct._IO_marker*, %struct._IO_FILE*, int, int, int, ushort, sbyte, [1 x sbyte], sbyte*, long, sbyte*, sbyte*, int, [52 x sbyte] }
 %struct._IO_marker = type { %struct._IO_marker*, %struct._IO_FILE*, int }

diff --git a/test/Transforms/SimplifyLibCalls/SPrintF.ll b/test/Transforms/SimplifyLibCalls/SPrintF.ll
index 48b76b194ecd67cf0e763acedc150cca7251c966..a8ad3699e2ab76416fea5c790efcce59e2911022 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/SPrintF.ll
+++ b/test/Transforms/SimplifyLibCalls/SPrintF.ll
@@ -1,6 +1,6 @@
 ; Test that the SPrintFOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*sprintf'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*sprintf}
 
 declare int %sprintf(sbyte*,sbyte*,...)
 declare int %puts(sbyte*)

diff --git a/test/Transforms/SimplifyLibCalls/StrCat.ll b/test/Transforms/SimplifyLibCalls/StrCat.ll
index 6532a637c1934fff7aa24c889c1039ae8268fe82..06bc833e5c925c5d9d5e236b582ac874ac0bbe32 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/StrCat.ll
+++ b/test/Transforms/SimplifyLibCalls/StrCat.ll
@@ -1,5 +1,6 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcat'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*strcat}
 
 declare sbyte* %strcat(sbyte*,sbyte*)
 declare int %puts(sbyte*)

diff --git a/test/Transforms/SimplifyLibCalls/StrChr.ll b/test/Transforms/SimplifyLibCalls/StrChr.ll
index b8e0de27339b46f51fd10654ed3ada47add84df1..56e624810a7ce9ec12c0812904b627f59142e537 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/StrChr.ll
+++ b/test/Transforms/SimplifyLibCalls/StrChr.ll
@@ -1,5 +1,6 @@
 ; Test that the StrChrOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*%strchr'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*%strchr}
 
 declare sbyte* %strchr(sbyte*,int)
 declare int %puts(sbyte*)

diff --git a/test/Transforms/SimplifyLibCalls/StrCmp.ll b/test/Transforms/SimplifyLibCalls/StrCmp.ll
index 1ab075de46b03033a1369132e2f3230a982d2ebf..ba2a4e07298e4ae3833c72d2bfd1b9bc20e2e0e6 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/StrCmp.ll
+++ b/test/Transforms/SimplifyLibCalls/StrCmp.ll
@@ -1,5 +1,6 @@
 ; Test that the StrCmpOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcmp'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*strcmp}
 
 declare int %strcmp(sbyte*,sbyte*)
 declare int %puts(sbyte*)

diff --git a/test/Transforms/SimplifyLibCalls/StrCpy.ll b/test/Transforms/SimplifyLibCalls/StrCpy.ll
index f75238bad4a608044f0baea2902c61fbbab7b1d9..481dccf24f2d5b7c5a9ae11d62f5bb69e39dd49c 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/StrCpy.ll
+++ b/test/Transforms/SimplifyLibCalls/StrCpy.ll
@@ -1,5 +1,6 @@
 ; Test that the StrCpyOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strcpy'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*strcpy}
 
 declare sbyte* %strcpy(sbyte*,sbyte*)
 declare int %puts(sbyte*)

diff --git a/test/Transforms/SimplifyLibCalls/StrLen.ll b/test/Transforms/SimplifyLibCalls/StrLen.ll
index d50b7c573f58fec27c5f1120a44feb65d36895cc..98a76c8862ea620c72b617d4549dee3ee8866f37 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/StrLen.ll
+++ b/test/Transforms/SimplifyLibCalls/StrLen.ll
@@ -1,6 +1,6 @@
 ; Test that the StrCatOptimizer works correctly
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    not grep 'call.*strlen'
+; RUN:    not grep {call.*strlen}
 
 target datalayout = "e-p:32:32"
 

diff --git a/test/Transforms/SimplifyLibCalls/StrNCmp.ll b/test/Transforms/SimplifyLibCalls/StrNCmp.ll
index 278861a9acda518f81bf0c72e3859baaab622c64..7de3410fc53dc38299a819c30a64a261362dd3b0 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/StrNCmp.ll
+++ b/test/Transforms/SimplifyLibCalls/StrNCmp.ll
@@ -1,5 +1,6 @@
 ; Test that the StrNCmpOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strncmp'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*strncmp}
 
 declare int %strncmp(sbyte*,sbyte*,int)
 declare int %puts(sbyte*)

diff --git a/test/Transforms/SimplifyLibCalls/ToAscii.ll b/test/Transforms/SimplifyLibCalls/ToAscii.ll
index e9580c6254161e917467d68a2fa676773418ca0b..0bc2664d4298b486f3aea4485dba525b279516f4 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/ToAscii.ll
+++ b/test/Transforms/SimplifyLibCalls/ToAscii.ll
@@ -1,5 +1,6 @@
 ; Test that the ToAsciiOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*toascii'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*toascii}
 
 declare int %toascii(int)
 

diff --git a/test/Transforms/SimplifyLibCalls/memcmp.ll b/test/Transforms/SimplifyLibCalls/memcmp.ll
index 3ccf00265acf8b8477b0b8fd047e2ad16e4ed934..bea9eed74a569cbc2e0978c5770ca0c018c1f007 100644 (file)
--- a/test/Transforms/SimplifyLibCalls/memcmp.ll
+++ b/test/Transforms/SimplifyLibCalls/memcmp.ll
@@ -1,5 +1,6 @@
 ; Test that the memcmpOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*memcmp' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:   not grep {call.*memcmp}
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls -disable-output
 
 declare int %memcmp(sbyte*,sbyte*,int)