Fix the syntax for these tests. Noticed by Duncan Sands.

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

17 files changed, 20 insertions, 18 deletions

diff --git a/test/Assembler/2002-07-25-ParserAssertionFailure.llx b/test/Assembler/2002-07-25-ParserAssertionFailure.llx
index c36964e..2145383 100644
--- 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 2>&1 < %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/2002-12-15-GlobalResolve.ll b/test/Assembler/2002-12-15-GlobalResolve.ll
index 3d32ac7..0a6e22c 100644
--- a/test/Assembler/2002-12-15-GlobalResolve.ll
+++ b/test/Assembler/2002-12-15-GlobalResolve.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s 2>/dev/null | llvm-as -o /dev/null -f &&
-; RUN: llvm-upgrade < %s 2>&1 | grep "Renaming global variable 'X' to"
+; RUN: llvm-upgrade < %s 2>/dev/null | llvm-as -o /dev/null -f
+; RUN: llvm-upgrade < %s |& grep {Renaming global variable 'X' to}
 
 %X = external global uint *
 %X = external global %T* 
diff --git a/test/Assembler/2003-04-15-ConstantInitAssertion.llx b/test/Assembler/2003-04-15-ConstantInitAssertion.llx
index 2d881c3..b2c6f8a 100644
--- a/test/Assembler/2003-04-15-ConstantInitAssertion.llx
+++ b/test/Assembler/2003-04-15-ConstantInitAssertion.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-as 2>&1 < %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-05-21-MalformedShiftCrash.llx b/test/Assembler/2003-05-21-MalformedShiftCrash.llx
index ef3445b..d49d591 100644
--- a/test/Assembler/2003-05-21-MalformedShiftCrash.llx
+++ b/test/Assembler/2003-05-21-MalformedShiftCrash.llx
@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-as 2>&1 < %s > /dev/null | grep "Logical operator requires integral"
+; RUN: llvm-as < %s > /dev/null |& grep "Logical operator requires integral"
 
 global i32 ashr (float 1.0, float 2.0)
diff --git a/test/Assembler/2003-05-21-MalformedStructCrash.llx b/test/Assembler/2003-05-21-MalformedStructCrash.llx
index 89c89bc..386c413 100644
--- a/test/Assembler/2003-05-21-MalformedStructCrash.llx
+++ b/test/Assembler/2003-05-21-MalformedStructCrash.llx
@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-as 2>&1 < %s  > /dev/null | grep "Illegal number of init"
+; RUN: llvm-as < %s  > /dev/null |& grep "Illegal number of init"
 
 global {} { i32 7, float 1.0, i32 7, i32 8 }
diff --git a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
index a3a685d..2cf1e56 100644
--- a/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
+++ b/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-as  2>&1 < %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 { 
   i32 (i8*, i8**, i32, i32, { 
diff --git a/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx b/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx
index 0838066..292bb0c 100644
--- a/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx
+++ b/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx
@@ -1,3 +1,3 @@
-; RUN: llvm-as %s 2>&1 | grep error
+; RUN: llvm-as %s |& grep error
 
 void %foo() {
diff --git a/test/Assembler/2005-01-31-CallingAggregateFunction.ll b/test/Assembler/2005-01-31-CallingAggregateFunction.ll
index c925214..366bd73 100644
--- a/test/Assembler/2005-01-31-CallingAggregateFunction.ll
+++ b/test/Assembler/2005-01-31-CallingAggregateFunction.ll
@@ -1,5 +1,5 @@
 ; RUN: ignore llvm-as < %s -o /dev/null -f |& \
-; RUN:    grep "LLVM functions cannot return aggregate types"
+; RUN:    grep {LLVM functions cannot return aggregate types}
 
 define void @test() {
 	call {} @foo()
diff --git a/test/Assembler/2006-09-28-CrashOnInvalid.ll b/test/Assembler/2006-09-28-CrashOnInvalid.ll
index 1691b3c..af1aaa3 100644
--- a/test/Assembler/2006-09-28-CrashOnInvalid.ll
+++ b/test/Assembler/2006-09-28-CrashOnInvalid.ll
@@ -1,6 +1,6 @@
 ; Test for PR902.  This program is erroneous, but should not crash llvm-as.
 ; This tests that a simple error is caught and processed correctly.
-; RUN: llvm-as < %s 2>&1 >/dev/null | grep 'FP constant invalid for type'
+; RUN: llvm-as < %s >/dev/null |& grep {FP constant invalid for type}
 
 define void @test() {
   add i32 1, 2.0
diff --git a/test/Assembler/2007-01-02-Undefined-Arg-Type.ll b/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
index 8592a51..354db6c 100644
--- a/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
+++ b/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
@@ -1,5 +1,5 @@
 ; The assembler should catch an undefined argument type .
-; RUN: llvm-as < %s -o /dev/null -f 2>&1 | grep "Reference to abstract argument"
+; RUN: llvm-as < %s -o /dev/null -f |& grep {Reference to abstract argument}
 
 ; %typedef.bc_struct = type opaque
 
diff --git a/test/Assembler/2007-01-16-CrashOnBadCast.ll b/test/Assembler/2007-01-16-CrashOnBadCast.ll
index 96d0f4f..20c9383 100644
--- a/test/Assembler/2007-01-16-CrashOnBadCast.ll
+++ b/test/Assembler/2007-01-16-CrashOnBadCast.ll
@@ -1,5 +1,5 @@
 ; PR1117
-; RUN: llvm-as < %s -o /dev/null -f |& grep "invalid cast opcode for cast from"
+; RUN: llvm-as < %s -o /dev/null -f |& grep {invalid cast opcode for cast from}
 
 define i8* @nada(i64 %X) {
     %result = trunc i64 %X to i8*
diff --git a/test/Assembler/2007-01-16-CrashOnBadCast2.ll b/test/Assembler/2007-01-16-CrashOnBadCast2.ll
index c771624..41b1708 100644
--- a/test/Assembler/2007-01-16-CrashOnBadCast2.ll
+++ b/test/Assembler/2007-01-16-CrashOnBadCast2.ll
@@ -1,4 +1,4 @@
 ; PR1117
-; RUN: llvm-as < %s -o /dev/null -f |& grep "invalid cast opcode for cast from"
+; RUN: llvm-as < %s -o /dev/null -f |& grep {invalid cast opcode for cast from}
 
 @X = constant i8* trunc (i64 0 to i8*)
diff --git a/test/Assembler/2007-01-21-UpgradeNoArgs.ll b/test/Assembler/2007-01-21-UpgradeNoArgs.ll
index e36704c..5e7de73 100644
--- a/test/Assembler/2007-01-21-UpgradeNoArgs.ll
+++ b/test/Assembler/2007-01-21-UpgradeNoArgs.ll
@@ -1,6 +1,6 @@
 ; Make sure we don't get an assertion failure, even though this is a parse 
 ; error
-; RUN: llvm-upgrade 2>&1 < %s > /dev/null | grep 'No arguments passed to a '
+; RUN: llvm-upgrade < %s > /dev/null |& grep {No arguments passed to a }
 
 %ty = type void (int)
 
diff --git a/test/Assembler/2007-01-22-UpgradeMalformedShift.ll b/test/Assembler/2007-01-22-UpgradeMalformedShift.ll
index 5ebd86c..da72cbc 100644
--- a/test/Assembler/2007-01-22-UpgradeMalformedShift.ll
+++ b/test/Assembler/2007-01-22-UpgradeMalformedShift.ll
@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-upgrade 2>&1 < %s > /dev/null | grep "Shift constant expression"
+; RUN: llvm-upgrade < %s > /dev/null |& grep {Shift constant expression}
 
 global int shr (float 1.0, ubyte 2)
diff --git a/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll b/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll
index 28c840c..1636b9d 100644
--- a/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll
+++ b/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll
@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-upgrade 2>&1 < %s  > /dev/null | grep "Illegal number of init"
+; RUN: llvm-upgrade < %s  > /dev/null |& grep {Illegal number of init}
 
 global {} { int 7, float 1.0, int 7, int 8 }
diff --git a/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll b/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll
index 0c3c4be..2ad5df0 100644
--- a/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll
+++ b/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade 2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
+; RUN: llvm-upgrade < %s -o /dev/null -f |& grep {Reference to an undef}
+; END.
 
 %d_reduction_0_dparser_gram = global { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)*, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** } { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** null }
 
diff --git a/test/Assembler/2007-03-18-InvalidNumberedVar.ll b/test/Assembler/2007-03-18-InvalidNumberedVar.ll
index dc06096..f71f93e 100644
--- a/test/Assembler/2007-03-18-InvalidNumberedVar.ll
+++ b/test/Assembler/2007-03-18-InvalidNumberedVar.ll
@@ -1,5 +1,5 @@
 ; PR 1258
-; RUN: llvm-as < %s 2>&1 >/dev/null -f | grep "Numbered.*does not match"
+; RUN: llvm-as < %s >/dev/null -f |& grep {Numbered.*does not match}
 
 define i32 @test1(i32 %a, i32 %b) {
 entry: