summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthijs Kooijman <matthijs@stdin.nl>2008-06-10 16:04:47 +0000
committerMatthijs Kooijman <matthijs@stdin.nl>2008-06-10 16:04:47 +0000
commita2f743eaff017f4bd94c0a9b37fdcb258dc9b3f6 (patch)
treed6cafe296a0b53c947db40e32407773cc6089a8c
parent34fe86cd9c83c04685b784e7ff29181b4981d6ce (diff)
downloadbcm5719-llvm-a2f743eaff017f4bd94c0a9b37fdcb258dc9b3f6.tar.gz
bcm5719-llvm-a2f743eaff017f4bd94c0a9b37fdcb258dc9b3f6.zip
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. llvm-svn: 52182
-rw-r--r--llvm/test/Assembler/AutoUpgradeIntrinsics.ll2
-rw-r--r--llvm/test/Feature/packed_struct.ll2
-rw-r--r--llvm/test/Integer/packed_struct_bt.ll2
-rw-r--r--llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll2
-rw-r--r--llvm/test/Linker/2004-12-03-DisagreeingType.ll2
-rw-r--r--llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll2
-rw-r--r--llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll2
7 files changed, 7 insertions, 7 deletions
diff --git a/llvm/test/Assembler/AutoUpgradeIntrinsics.ll b/llvm/test/Assembler/AutoUpgradeIntrinsics.ll
index 15f638ce06f..af4ec92e099 100644
--- a/llvm/test/Assembler/AutoUpgradeIntrinsics.ll
+++ b/llvm/test/Assembler/AutoUpgradeIntrinsics.ll
@@ -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)
diff --git a/llvm/test/Feature/packed_struct.ll b/llvm/test/Feature/packed_struct.ll
index 5bf609b7772..4d4ace9534d 100644
--- a/llvm/test/Feature/packed_struct.ll
+++ b/llvm/test/Feature/packed_struct.ll
@@ -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 }>
diff --git a/llvm/test/Integer/packed_struct_bt.ll b/llvm/test/Integer/packed_struct_bt.ll
index 3713917ac97..a4d01e7d84b 100644
--- a/llvm/test/Integer/packed_struct_bt.ll
+++ b/llvm/test/Integer/packed_struct_bt.ll
@@ -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 }>
diff --git a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
index b3e64da35b3..f61d8861049 100644
--- a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
+++ b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
@@ -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 }
diff --git a/llvm/test/Linker/2004-12-03-DisagreeingType.ll b/llvm/test/Linker/2004-12-03-DisagreeingType.ll
index 63d851b1673..7378fdd3579 100644
--- a/llvm/test/Linker/2004-12-03-DisagreeingType.ll
+++ b/llvm/test/Linker/2004-12-03-DisagreeingType.ll
@@ -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.
diff --git a/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll b/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
index ef48cf8d213..dbac15c3a52 100644
--- a/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
+++ b/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
@@ -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]
diff --git a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
index 47b70351e97..e366a655940 100644
--- a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
+++ b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
@@ -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*)
OpenPOWER on IntegriCloud