Mon Apr 16 08:01:02 PDT 2007

Changes in directory llvm/test/Assembler:

2002-07-25-ParserAssertionFailure.llx updated: 1.4 -> 1.5
2002-12-15-GlobalResolve.ll updated: 1.5 -> 1.6
2003-04-15-ConstantInitAssertion.llx updated: 1.4 -> 1.5
2003-05-21-MalformedShiftCrash.llx updated: 1.6 -> 1.7
2003-05-21-MalformedStructCrash.llx updated: 1.5 -> 1.6
2003-12-30-TypeMapInvalidMemory.llx updated: 1.9 -> 1.10
2004-03-30-UnclosedFunctionCrash.llx updated: 1.1 -> 1.2
2005-01-31-CallingAggregateFunction.ll updated: 1.4 -> 1.5
2006-09-28-CrashOnInvalid.ll updated: 1.3 -> 1.4
2007-01-02-Undefined-Arg-Type.ll updated: 1.4 -> 1.5
2007-01-16-CrashOnBadCast.ll updated: 1.3 -> 1.4
2007-01-16-CrashOnBadCast2.ll updated: 1.3 -> 1.4
2007-01-21-UpgradeNoArgs.ll updated: 1.1 -> 1.2
2007-01-22-UpgradeMalformedShift.ll updated: 1.1 -> 1.2
2007-01-22-UpgradeMalformedStruct.ll updated: 1.1 -> 1.2
2007-01-22-UpgradeTypeMapInvalidMemory.ll updated: 1.1 -> 1.2
2007-03-18-InvalidNumberedVar.ll updated: 1.1 -> 1.2
---
Log message:

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


---
Diffs of the changes:  (+20 -18)

 2002-07-25-ParserAssertionFailure.llx     |    2 +-
 2002-12-15-GlobalResolve.ll               |    4 ++--
 2003-04-15-ConstantInitAssertion.llx      |    2 +-
 2003-05-21-MalformedShiftCrash.llx        |    2 +-
 2003-05-21-MalformedStructCrash.llx       |    2 +-
 2003-12-30-TypeMapInvalidMemory.llx       |    3 ++-
 2004-03-30-UnclosedFunctionCrash.llx      |    2 +-
 2005-01-31-CallingAggregateFunction.ll    |    2 +-
 2006-09-28-CrashOnInvalid.ll              |    2 +-
 2007-01-02-Undefined-Arg-Type.ll          |    2 +-
 2007-01-16-CrashOnBadCast.ll              |    2 +-
 2007-01-16-CrashOnBadCast2.ll             |    2 +-
 2007-01-21-UpgradeNoArgs.ll               |    2 +-
 2007-01-22-UpgradeMalformedShift.ll       |    2 +-
 2007-01-22-UpgradeMalformedStruct.ll      |    2 +-
 2007-01-22-UpgradeTypeMapInvalidMemory.ll |    3 ++-
 2007-03-18-InvalidNumberedVar.ll          |    2 +-
 17 files changed, 20 insertions(+), 18 deletions(-)


Index: llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx
diff -u llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx:1.4 llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx:1.5

--- llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx:1.4	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx	Mon Apr 16 10:00:39 2007
@@ -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)
 


Index: llvm/test/Assembler/2002-12-15-GlobalResolve.ll
diff -u llvm/test/Assembler/2002-12-15-GlobalResolve.ll:1.5 llvm/test/Assembler/2002-12-15-GlobalResolve.ll:1.6
--- llvm/test/Assembler/2002-12-15-GlobalResolve.ll:1.5	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2002-12-15-GlobalResolve.ll	Mon Apr 16 10:00:39 2007
@@ -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* 


Index: llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx
diff -u llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx:1.4 llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx:1.5
--- llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx:1.4	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx	Mon Apr 16 10:00:39 2007
@@ -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 }


Index: llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx
diff -u llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx:1.6 llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx:1.7
--- llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx:1.6	Thu Feb  1 20:16:22 2007
+++ llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx	Mon Apr 16 10:00:39 2007
@@ -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)


Index: llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx
diff -u llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx:1.5 llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx:1.6
--- llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx:1.5	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx	Mon Apr 16 10:00:39 2007
@@ -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 }


Index: llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
diff -u llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.9 llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.10
--- llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.9	Thu Mar 29 20:35:32 2007
+++ llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx	Mon Apr 16 10:00:39 2007
@@ -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, { 


Index: llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx
diff -u llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx:1.1 llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx:1.2
--- llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx:1.1	Tue Mar 30 14:58:00 2004
+++ llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx	Mon Apr 16 10:00:39 2007
@@ -1,3 +1,3 @@
-; RUN: llvm-as %s 2>&1 | grep error
+; RUN: llvm-as %s |& grep error
 
 void %foo() {


Index: llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll
diff -u llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.4 llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.5
--- llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.4	Sun Apr 15 05:07:55 2007
+++ llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll	Mon Apr 16 10:00:39 2007
@@ -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()


Index: llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll
diff -u llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll:1.3 llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll:1.4
--- llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll:1.3	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll	Mon Apr 16 10:00:39 2007
@@ -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


Index: llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
diff -u llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll:1.4 llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll:1.5
--- llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll:1.4	Tue Mar 27 21:38:26 2007
+++ llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll	Mon Apr 16 10:00:39 2007
@@ -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
 


Index: llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll
diff -u llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.3 llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.4
--- llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.3	Sun Apr 15 05:07:55 2007
+++ llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll	Mon Apr 16 10:00:39 2007
@@ -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*


Index: llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll
diff -u llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.3 llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.4
--- llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.3	Sun Apr 15 05:07:55 2007
+++ llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll	Mon Apr 16 10:00:39 2007
@@ -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*)


Index: llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll
diff -u llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll:1.1 llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll:1.2
--- llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll:1.1	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll	Mon Apr 16 10:00:39 2007
@@ -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)
 


Index: llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll
diff -u llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll:1.1 llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll:1.2
--- llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll:1.1	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll	Mon Apr 16 10:00:39 2007
@@ -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)


Index: llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll
diff -u llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll:1.1 llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll:1.2
--- llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll:1.1	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll	Mon Apr 16 10:00:39 2007
@@ -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 }


Index: llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll
diff -u llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll:1.1 llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll:1.2
--- llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll:1.1	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll	Mon Apr 16 10:00:39 2007
@@ -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, sbyt!
 e*, 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, i!
 nt, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.G!
 rammar*,
 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 }
 


Index: llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll
diff -u llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll:1.1 llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll:1.2
--- llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll:1.1	Mon Mar 19 13:41:37 2007
+++ llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll	Mon Apr 16 10:00:39 2007
@@ -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:




