[llvm-commits] CVS: llvm/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx 2004-07-28-MustAliasbug.llx 2005-03-09-BrokenBasicAA.ll 2007-01-13-BasePointerBadNoAlias.ll dg.exp tailcall-modref.ll

[Reid Spencer]

Changes in directory llvm/test/Analysis/BasicAA:

2004-01-29-InvariantMemory.llx updated: 1.1 -> 1.2
2004-07-28-MustAliasbug.llx updated: 1.3 -> 1.4
2005-03-09-BrokenBasicAA.ll updated: 1.3 -> 1.4
2007-01-13-BasePointerBadNoAlias.ll updated: 1.3 -> 1.4
dg.exp updated: 1.4 -> 1.5
tailcall-modref.ll updated: 1.3 -> 1.4
---
Log message:

Convert test cases to new llvm.exp version of llvm_runtest and fix tests
that it found to be broken.


---
Diffs of the changes:  (+13 -7)

 2004-01-29-InvariantMemory.llx      |    3 ++-
 2004-07-28-MustAliasbug.llx         |    2 +-
 2005-03-09-BrokenBasicAA.ll         |    3 ++-
 2007-01-13-BasePointerBadNoAlias.ll |    7 +++++--
 dg.exp                              |    2 +-
 tailcall-modref.ll                  |    3 ++-
 6 files changed, 13 insertions(+), 7 deletions(-)


Index: llvm/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx
diff -u llvm/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx:1.1 llvm/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx:1.2
--- llvm/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx:1.1	Fri Jan 30 16:18:47 2004
+++ llvm/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx	Sat Apr 14 14:27:03 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | \
+; RUN:    llvm-dis | not grep load
 
 %X = constant [2 x int] [int 4, int 5]
 


Index: llvm/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
diff -u llvm/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx:1.3 llvm/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx:1.4
--- llvm/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx:1.3	Sun Dec 31 00:01:59 2006
+++ llvm/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx	Sat Apr 14 14:27:03 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep {store i32 0}
 
 void %test({int,int }* %P) {
 	%Q = getelementptr {int,int}* %P, int 1


Index: llvm/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
diff -u llvm/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll:1.3 llvm/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll:1.4
--- llvm/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll:1.3	Sun Dec 31 00:01:59 2006
+++ llvm/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll	Sat Apr 14 14:27:03 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load i32\* %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine |\
+; RUN:    llvm-dis | grep {load i32\\* %A}
 
 declare double* %useit(int*)
 


Index: llvm/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll
diff -u llvm/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll:1.3 llvm/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll:1.4
--- llvm/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll:1.3	Tue Mar 27 21:38:26 2007
+++ llvm/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll	Sat Apr 14 14:27:03 2007
@@ -1,6 +1,9 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'sub i32' &&
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep 'ret i32 0'
 ; PR1109
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN:   grep {sub i32}
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN:   not grep {ret i32 0}
+; END.
 
 target datalayout = "e-p:32:32"
 target triple = "i686-apple-darwin8"


Index: llvm/test/Analysis/BasicAA/dg.exp
diff -u llvm/test/Analysis/BasicAA/dg.exp:1.4 llvm/test/Analysis/BasicAA/dg.exp:1.5
--- llvm/test/Analysis/BasicAA/dg.exp:1.4	Wed Apr 11 14:56:57 2007
+++ llvm/test/Analysis/BasicAA/dg.exp	Sat Apr 14 14:27:03 2007
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
 llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]


Index: llvm/test/Analysis/BasicAA/tailcall-modref.ll
diff -u llvm/test/Analysis/BasicAA/tailcall-modref.ll:1.3 llvm/test/Analysis/BasicAA/tailcall-modref.ll:1.4
--- llvm/test/Analysis/BasicAA/tailcall-modref.ll:1.3	Sun Dec 31 00:01:59 2006
+++ llvm/test/Analysis/BasicAA/tailcall-modref.ll	Sat Apr 14 14:27:03 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine |\
+; RUN:   llvm-dis | grep {ret i32 0}
 declare void %foo(int*)
 declare void %bar()