For PR1319:

Fix test syntax per new rules.


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

6 files changed, 13 insertions, 6 deletions

diff --git a/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx b/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx
index 77ac17bc30..9a4541b717 100644
--- a/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx
+++ b/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx
@@ -3,7 +3,7 @@
 ; it makes a ton of annoying overlapping live ranges.  This code should not
 ; cause spills!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | not grep spilled
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& not grep spilled
 
 target endian = little
 target pointersize = 32
diff --git a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
index bf96708da2..da063df46c 100644
--- a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
+++ b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep 'asm-printer' | grep 7
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& \
+; RUN:   grep asm-printer | grep 7
 
 int %g(int %a, int %b) {
 	%tmp.1 = shl int %b, ubyte 1
diff --git a/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll b/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
index 71b90760e3..f89cfe0449 100644
--- a/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
+++ b/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -stats 2>&1 | not grep 'Number of register spills'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -stats |& \
+; RUN:   not grep {Number of register spills}
 
 int %foo(<4 x float>* %a, <4 x float>* %b, <4 x float>* %c, <4 x float>* %d) {
 	%tmp44 = load <4 x float>* %a		; <<4 x float>> [#uses=9]
diff --git a/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/test/CodeGen/X86/2006-05-02-InstrSched1.ll
index 631e416836..59a15f4ec9 100644
--- a/test/CodeGen/X86/2006-05-02-InstrSched1.ll
+++ b/test/CodeGen/X86/2006-05-02-InstrSched1.ll
@@ -1,4 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static -stats 2>&1 | grep "asm-printer" | grep 14
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=x86 -relocation-model=static -stats |& \
+; RUN:   grep asm-printer | grep 14
+;
 %size20 = external global uint		; <uint*> [#uses=1]
 %in5 = external global ubyte*		; <ubyte**> [#uses=1]
 
diff --git a/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/test/CodeGen/X86/2006-05-02-InstrSched2.ll
index 9b58de251a..b7ef09f91d 100644
--- a/test/CodeGen/X86/2006-05-02-InstrSched2.ll
+++ b/test/CodeGen/X86/2006-05-02-InstrSched2.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep "asm-printer" | grep 18
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& \
+; RUN:   grep asm-printer | grep 18
 
 void %_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(sbyte* %tmp435.i, uint* %tmp449.i.out) {
 newFuncRoot:
diff --git a/test/CodeGen/X86/iabs.ll b/test/CodeGen/X86/iabs.ll
index e1eab33e5e..7c23645c6a 100644
--- a/test/CodeGen/X86/iabs.ll
+++ b/test/CodeGen/X86/iabs.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86-64 -stats 2>&1 | grep '6 .*Number of machine instrs printed'
+; RUN: llvm-as < %s | llc -march=x86-64 -stats |& \
+; RUN:   grep {6 .*Number of machine instrs printed}
 
 ;; Integer absolute value, should produce something at least as good as:
 ;;       movl %edi, %eax