[llvm-commits] [llvm] r52182 - in /llvm/trunk/test: Assembler/AutoUpgradeIntrinsics.ll Feature/packed_struct.ll Integer/packed_struct_bt.ll Linker/2003-10-21-ConflictingTypesTolerance.ll Linker/2004-12-03-DisagreeingType.ll Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll

[Matthijs Kooijman]

Author: matthijs
Date: Tue Jun 10 11:04:47 2008
New Revision: 52182

URL: http://llvm.org/viewvc/llvm-project?rev=52182&view=rev
Log:
Fix some escaping and quoting in RUN lines, mainly involving { and <. In two
cases quoting of <{ didn't work out, so I changed the grep to check for }>
instead.

This fixes 7 testcases that were not properly running before.

Modified:
    llvm/trunk/test/Assembler/AutoUpgradeIntrinsics.ll
    llvm/trunk/test/Feature/packed_struct.ll
    llvm/trunk/test/Integer/packed_struct_bt.ll
    llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
    llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll
    llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
    llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll

Modified: llvm/trunk/test/Assembler/AutoUpgradeIntrinsics.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/AutoUpgradeIntrinsics.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Assembler/AutoUpgradeIntrinsics.ll (original)
+++ llvm/trunk/test/Assembler/AutoUpgradeIntrinsics.ll Tue Jun 10 11:04:47 2008
@@ -7,7 +7,7 @@
 ; RUN: llvm-as < %s | llvm-dis | \
 ; RUN:   not grep {llvm\\.bswap\\.i\[0-9\]*\\.i\[0-9\]*}
 ; RUN: llvm-as < %s | llvm-dis | \
-; RUN:   grep {llvm\\.x86\\.mmx\\.ps} | grep {2 x i32> | count 6
+; RUN:   grep {llvm\\.x86\\.mmx\\.ps} | grep {\\\<2 x i32\\\>} | count 6
 
 declare i32 @llvm.ctpop.i28(i28 %val)
 declare i32 @llvm.cttz.i29(i29 %val)

Modified: llvm/trunk/test/Feature/packed_struct.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/packed_struct.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Feature/packed_struct.ll (original)
+++ llvm/trunk/test/Feature/packed_struct.ll Tue Jun 10 11:04:47 2008
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: not grep cast %t2.ll
-; RUN: grep {\<\{} %t2.ll
+; RUN: grep {\\}>} %t2.ll
 ; END.
 
 %struct.anon = type <{ i8, i32, i32, i32 }>

Modified: llvm/trunk/test/Integer/packed_struct_bt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Integer/packed_struct_bt.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Integer/packed_struct_bt.ll (original)
+++ llvm/trunk/test/Integer/packed_struct_bt.ll Tue Jun 10 11:04:47 2008
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: not grep cast %t2.ll
-; RUN: grep {\<\{} %t2.ll
+; RUN: grep {\\}>} %t2.ll
 ; END.
 
 %struct.anon = type <{ i8, i35, i35, i35 }>

Modified: llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll (original)
+++ llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll Tue Jun 10 11:04:47 2008
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s > %t.out1.bc
 ; RUN: echo { %S = type \[8 x i32\] external global %S } | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %S | grep \{
+; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %S | grep {\\{}
 
 %S = type { i32 }
 

Modified: llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll (original)
+++ llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll Tue Jun 10 11:04:47 2008
@@ -1,7 +1,7 @@
 ; RUN: echo {@G = weak global \{\{\{\{double\}\}\}\} zeroinitializer } | \
 ; RUN:   llvm-as > %t.out2.bc
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep {\}}
+; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep {\\}}
 
 ; When linked, the global above should be eliminated, being merged with the 
 ; global below.

Modified: llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll Tue Jun 10 11:04:47 2008
@@ -1,7 +1,7 @@
 ; Scalar replacement was incorrectly promoting this alloca!!
 ;
 ; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | \
-; RUN:   sed {s/;.*//g} | grep \[
+; RUN:   sed {s/;.*//g} | grep {\\\[}
 
 define i8* @test() {
 	%A = alloca [30 x i8]		; <[30 x i8]*> [#uses=1]

Modified: llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll?rev=52182&r1=52181&r2=52182&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll Tue Jun 10 11:04:47 2008
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | \
-; RUN:   grep alloca | grep \{
+; RUN:   grep alloca | grep {\\{}
 
 declare i32 @.callback_1(i8*)