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

diff --git a/test/Assembler/2002-07-25-ParserAssertionFailure.llx b/test/Assembler/2002-07-25-ParserAssertionFailure.llx
index c36964edd5c623ca4fc4478b79711bf372d9834c..214538384ff520c11625c61f1909bcfa3c33eb5e 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 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 3d32ac780e2855389783ff8d2fe479665327e0f6..0a6e22cac76432e41956b2e8010277cc4039a77e 100644 (file)
--- 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 2d881c3ecd71ec907936f48813ede6033337f957..b2c6f8a5f4716f79bba71fb553fc2ff9dac07c1e 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 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 ef3445b13fe35f0571c9ff0cb7fbe872ac84fe66..d49d591b1ef6c036d90331ea392e47b6d353cced 100644 (file)
--- 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 89c89bc59f490f2636a60290c05d4f5d0e302b92..386c413a542b6a409ddeefaf0eceb2271e12a5b5 100644 (file)
--- 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 a3a685deb7818df012eed7810b1447eb5a7b8380..2cf1e56a361ef13e34f8ec3ee2603777808cbbb4 100644 (file)
--- 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 0838066b5825dbb11d1574a7d41e23caf0d25109..292bb0cfff9cbd2c5b2674df078ba70e541f0e3c 100644 (file)
--- 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 c9252147fb38bc37e638e07d0599af7b921f6bbe..366bd7326d310739ebf840f95f37d084919fce7f 100644 (file)
--- 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 1691b3c4c505c99ce7f472aad7e52ee4595f665f..af1aaa3847552774df73d05f1309e7d55fd6c410 100644 (file)
--- 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 8592a51927847517922a3c5006ff620edff1c140..354db6c561ad5c852b9f18490bfd4053969c1afe 100644 (file)
--- 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 96d0f4f4a9edcc5c5fa0c33cb25c6b51348c16ec..20c9383b075497a6aff8f90d18a7177a87336866 100644 (file)
--- 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 c7716241c1bf141e2e12f42bdafc22d08ed01be3..41b1708b8d70c5bb53f4d49062ffe4237d5e5d67 100644 (file)
--- 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 e36704c3aab0fc1430015df26913ae0137faddf6..5e7de73f9a9ebd4db5c44315ade41c80d8ee6f94 100644 (file)
--- 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 5ebd86cbc003fc67662ec7d5d7bc2f9bfe89549e..da72cbc6b91ad3f249533279e341325d04cd820c 100644 (file)
--- 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 28c840c3b04c315778969a856a83fadf115134a4..1636b9d85d2cc7cb3da7c4ee50d4ad39c30711bf 100644 (file)
--- 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 0c3c4beb6ced72dc7129d28d7bc743e301c55681..2ad5df078e3bf9714be4efcc3bfe76e62dfa4808 100644 (file)
--- 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 dc0609601120c02775122f824725b79c61547278..f71f93e912afc50e486541577accaf8911b607e6 100644 (file)
--- 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: