[llvm-commits] CVS: llvm/test/Transforms/Inline/casts.ll dg.exp inline_cleanup.ll inline_constprop.ll inline_dce.ll inline_prune.ll invoke_test-1.ll invoke_test-2.ll

[Reid Spencer]

Changes in directory llvm/test/Transforms/Inline:

casts.ll updated: 1.3 -> 1.4
dg.exp updated: 1.4 -> 1.5
inline_cleanup.ll updated: 1.2 -> 1.3
inline_constprop.ll updated: 1.2 -> 1.3
inline_dce.ll updated: 1.3 -> 1.4
inline_prune.ll updated: 1.2 -> 1.3
invoke_test-1.ll updated: 1.4 -> 1.5
invoke_test-2.ll updated: 1.4 -> 1.5
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Upgrade to use new Tcl exec based test harness.


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

 casts.ll            |    2 +-
 dg.exp              |    4 ++--
 inline_cleanup.ll   |    7 ++++---
 inline_constprop.ll |    3 +--
 inline_dce.ll       |    3 ++-
 inline_prune.ll     |    4 ++--
 invoke_test-1.ll    |    3 ++-
 invoke_test-2.ll    |    3 ++-
 8 files changed, 16 insertions(+), 13 deletions(-)


Index: llvm/test/Transforms/Inline/casts.ll
diff -u llvm/test/Transforms/Inline/casts.ll:1.3 llvm/test/Transforms/Inline/casts.ll:1.4
--- llvm/test/Transforms/Inline/casts.ll:1.3	Sun Dec 31 00:01:59 2006
+++ llvm/test/Transforms/Inline/casts.ll	Sun Apr 15 03:30:32 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep 'ret i32 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep {ret i32 1}
 ; ModuleID = 'short.opt.bc'
 
 implementation   ; Functions:


Index: llvm/test/Transforms/Inline/dg.exp
diff -u llvm/test/Transforms/Inline/dg.exp:1.4 llvm/test/Transforms/Inline/dg.exp:1.5
--- llvm/test/Transforms/Inline/dg.exp:1.4	Wed Apr 11 14:56:58 2007
+++ llvm/test/Transforms/Inline/dg.exp	Sun Apr 15 03:30:32 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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]


Index: llvm/test/Transforms/Inline/inline_cleanup.ll
diff -u llvm/test/Transforms/Inline/inline_cleanup.ll:1.2 llvm/test/Transforms/Inline/inline_cleanup.ll:1.3
--- llvm/test/Transforms/Inline/inline_cleanup.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/Inline/inline_cleanup.ll	Sun Apr 15 03:30:32 2007
@@ -1,9 +1,10 @@
 ; Test that the inliner doesn't leave around dead allocas, and that it folds
 ; uncond branches away after it is done specializing.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'alloca.*uses=0' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:    not grep {alloca.*uses=0}
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:    not grep {br label}
 
 %A = weak global int 0		; <int*> [#uses=1]
 %B = weak global int 0		; <int*> [#uses=1]


Index: llvm/test/Transforms/Inline/inline_constprop.ll
diff -u llvm/test/Transforms/Inline/inline_constprop.ll:1.2 llvm/test/Transforms/Inline/inline_constprop.ll:1.3
--- llvm/test/Transforms/Inline/inline_constprop.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/Inline/inline_constprop.ll	Sun Apr 15 03:30:32 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee
 ; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep div
 
 implementation


Index: llvm/test/Transforms/Inline/inline_dce.ll
diff -u llvm/test/Transforms/Inline/inline_dce.ll:1.3 llvm/test/Transforms/Inline/inline_dce.ll:1.4
--- llvm/test/Transforms/Inline/inline_dce.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/Inline/inline_dce.ll	Sun Apr 15 03:30:32 2007
@@ -1,7 +1,8 @@
 ; This checks to ensure that the inline pass deletes functions if they get 
 ; inlined into all of their callers.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep %reallysmall
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:   not grep %reallysmall
 
 implementation
 


Index: llvm/test/Transforms/Inline/inline_prune.ll
diff -u llvm/test/Transforms/Inline/inline_prune.ll:1.2 llvm/test/Transforms/Inline/inline_prune.ll:1.3
--- llvm/test/Transforms/Inline/inline_prune.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/Inline/inline_prune.ll	Sun Apr 15 03:30:32 2007
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'callee[12](' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:    not grep {callee\[12\](}
 ; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep mul
 
 implementation


Index: llvm/test/Transforms/Inline/invoke_test-1.ll
diff -u llvm/test/Transforms/Inline/invoke_test-1.ll:1.4 llvm/test/Transforms/Inline/invoke_test-1.ll:1.5
--- llvm/test/Transforms/Inline/invoke_test-1.ll:1.4	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/Inline/invoke_test-1.ll	Sun Apr 15 03:30:32 2007
@@ -1,7 +1,8 @@
 ; Test that we can inline a simple function, turning the calls in it into invoke
 ; instructions
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep 'call[^e]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:   not grep {call\[^e\]}
 
 declare void %might_throw()
 


Index: llvm/test/Transforms/Inline/invoke_test-2.ll
diff -u llvm/test/Transforms/Inline/invoke_test-2.ll:1.4 llvm/test/Transforms/Inline/invoke_test-2.ll:1.5
--- llvm/test/Transforms/Inline/invoke_test-2.ll:1.4	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/Inline/invoke_test-2.ll	Sun Apr 15 03:30:32 2007
@@ -1,7 +1,8 @@
 ; Test that if an invoked function is inlined, and if that function cannot
 ; throw, that the dead handler is now unreachable.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline -simplifycfg | llvm-dis | not grep UnreachableExceptionHandler
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline -simplifycfg | llvm-dis | \
+; RUN:   not grep UnreachableExceptionHandler
 
 declare void %might_throw()