For PR1319:

Upgrade to use new Tcl exec based test harness.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36062 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll b/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
index 7c0eb57..2b3a2ea 100644 (file)
--- a/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
+++ b/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | grep '@test(' &&
+; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | grep {@test(}
 ; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep dead
 
 define internal i32 @test(i32 %X, i32 %dead) {

diff --git a/test/Transforms/DeadArgElim/dg.exp b/test/Transforms/DeadArgElim/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/DeadArgElim/dg.exp
+++ b/test/Transforms/DeadArgElim/dg.exp
@@ -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}]]

diff --git a/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll b/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
index f963b9a..36afb24 100644 (file)
--- a/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
+++ b/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse -scalarrepl -instcombine | llvm-dis | not grep 'ret int undef'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse -scalarrepl -instcombine | \
+; RUN:   llvm-dis | not grep {ret int undef}
 
 int %test(double %__x) {
        %__u = alloca { [3 x int] }

diff --git a/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll b/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
index 100c795..ec48e46 100644 (file)
--- a/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
+++ b/test/Transforms/DeadStoreElimination/2004-12-28-PartialStore.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store i32 1234567'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | \
+; RUN:    grep {store i32 1234567}
 
 ; Do not delete stores that are only partially killed.
 

diff --git a/test/Transforms/DeadStoreElimination/PartialStore.ll b/test/Transforms/DeadStoreElimination/PartialStore.ll
index a9b3366..bdc16db 100644 (file)
--- a/test/Transforms/DeadStoreElimination/PartialStore.ll
+++ b/test/Transforms/DeadStoreElimination/PartialStore.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | not grep 'store sbyte'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | \
+; RUN:    not grep {store sbyte}
 ; Ensure that the dead store is deleted in this case.  It is wholely
 ; overwritten by the second store.
 int %test() {

diff --git a/test/Transforms/DeadStoreElimination/dg.exp b/test/Transforms/DeadStoreElimination/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/DeadStoreElimination/dg.exp
+++ b/test/Transforms/DeadStoreElimination/dg.exp
@@ -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}]]

diff --git a/test/Transforms/DecomposeMultiDimRefs/dg.exp b/test/Transforms/DecomposeMultiDimRefs/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/DecomposeMultiDimRefs/dg.exp
+++ b/test/Transforms/DecomposeMultiDimRefs/dg.exp
@@ -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}]]

diff --git a/test/Transforms/GCSE/2002-05-14-OperandSwap.ll b/test/Transforms/GCSE/2002-05-14-OperandSwap.ll
index 5e893bf..51183b8 100644 (file)
--- a/test/Transforms/GCSE/2002-05-14-OperandSwap.ll
+++ b/test/Transforms/GCSE/2002-05-14-OperandSwap.ll
@@ -1,7 +1,8 @@
 ; This entire chain of computation should be optimized away, but
 ; wasn't because the two multiplies were not detected as being identical.
 ;
-; RUN: llvm-as < %s  | opt -gcse -instcombine -dce | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine -dce | \
+; RUN:    llvm-dis | not grep sub
 
 implementation   ; Functions:
 

diff --git a/test/Transforms/GCSE/dg.exp b/test/Transforms/GCSE/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/GCSE/dg.exp
+++ b/test/Transforms/GCSE/dg.exp
@@ -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}]]

diff --git a/test/Transforms/GlobalDCE/dg.exp b/test/Transforms/GlobalDCE/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/GlobalDCE/dg.exp
+++ b/test/Transforms/GlobalDCE/dg.exp
@@ -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}]]

diff --git a/test/Transforms/GlobalOpt/constantexpr-dangle.ll b/test/Transforms/GlobalOpt/constantexpr-dangle.ll
index 89ce1ee..6e33ae0 100644 (file)
--- a/test/Transforms/GlobalOpt/constantexpr-dangle.ll
+++ b/test/Transforms/GlobalOpt/constantexpr-dangle.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-as < %s | opt -instcombine -globalopt | llvm-dis | grep 'internal fastcc float @foo'
+; RUN: llvm-as < %s | opt -instcombine -globalopt | llvm-dis | \
+; RUN:   grep {internal fastcc float @foo}
+
 define internal float @foo() {
         ret float 0.000000e+00
 }

diff --git a/test/Transforms/GlobalOpt/dg.exp b/test/Transforms/GlobalOpt/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/GlobalOpt/dg.exp
+++ b/test/Transforms/GlobalOpt/dg.exp
@@ -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}]]

diff --git a/test/Transforms/GlobalOpt/integer-bool.ll b/test/Transforms/GlobalOpt/integer-bool.ll
index 29cb4f5..eef2f72 100644 (file)
--- a/test/Transforms/GlobalOpt/integer-bool.ll
+++ b/test/Transforms/GlobalOpt/integer-bool.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -instcombine | \
-; RUN:    llvm-dis | grep 'ret i1 true'
+; RUN:    llvm-dis | grep {ret i1 true}
 
 ;; check that global opt turns integers that only hold 0 or 1 into bools.
 

diff --git a/test/Transforms/GlobalOpt/memcpy.ll b/test/Transforms/GlobalOpt/memcpy.ll
index ea4483f..a110d40 100644 (file)
--- a/test/Transforms/GlobalOpt/memcpy.ll
+++ b/test/Transforms/GlobalOpt/memcpy.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
-; RUN:   grep 'G1 = internal constant'
+; RUN:   grep {G1 = internal constant}
 
 %G1 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
 

diff --git a/test/Transforms/GlobalOpt/memset.ll b/test/Transforms/GlobalOpt/memset.ll
index 5159d28..a4f81c3 100644 (file)
--- a/test/Transforms/GlobalOpt/memset.ll
+++ b/test/Transforms/GlobalOpt/memset.ll
@@ -1,20 +1,22 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep internal
 ; both globals are write only, delete them.
 
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
+; RUN:   not grep internal
+
 %G0 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
 
 %G1 = internal global [4 x int] [ int 1, int 2, int 3, int 4]
 
 implementation   ; Functions:
 
-declare void %llvm.memcpy(sbyte*, sbyte*, uint, uint)
-declare void %llvm.memset(sbyte*, ubyte, uint, uint)
+declare void %llvm.memcpy.i32(sbyte*, sbyte*, uint, uint)
+declare void %llvm.memset.i32(sbyte*, ubyte, uint, uint)
 
 void %foo() {
         %Blah = alloca [58 x sbyte]             ; <[58 x sbyte]*> [#uses=2]
         %tmp3 = cast [58 x sbyte]* %Blah to sbyte*
-       call void %llvm.memcpy( sbyte* cast ([4 x int]* %G1 to sbyte*), sbyte* %tmp3, uint 16, uint 1)
-       call void %llvm.memset( sbyte* getelementptr ([58 x sbyte]* %G0, int 0, int 0), uint 17, uint 58, uint 1)
+       call void %llvm.memcpy.i32( sbyte* cast ([4 x int]* %G1 to sbyte*), sbyte* %tmp3, uint 16, uint 1)
+       call void %llvm.memset.i32( sbyte* getelementptr ([58 x sbyte]* %G0, int 0, int 0), uint 17, uint 58, uint 1)
        ret void
 }
 

diff --git a/test/Transforms/GlobalOpt/storepointer-compare.llx b/test/Transforms/GlobalOpt/storepointer-compare.llx
index 688cf1a..d85d97d 100644 (file)
--- a/test/Transforms/GlobalOpt/storepointer-compare.llx
+++ b/test/Transforms/GlobalOpt/storepointer-compare.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'call void @Actual'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
+; RUN:   grep {call void @Actual}
 
 ; Check that a comparison does not prevent an indirect call from being made 
 ; direct.  The global will still remain, but indirect call elim is still good.

diff --git a/test/Transforms/IPConstantProp/dg.exp b/test/Transforms/IPConstantProp/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/IPConstantProp/dg.exp
+++ b/test/Transforms/IPConstantProp/dg.exp
@@ -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}]]

diff --git a/test/Transforms/IPConstantProp/return-constant.ll b/test/Transforms/IPConstantProp/return-constant.ll
index 50e6a77..36cd493 100644 (file)
--- a/test/Transforms/IPConstantProp/return-constant.ll
+++ b/test/Transforms/IPConstantProp/return-constant.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -instcombine | \
-; RUN:    llvm-dis | grep 'ret i1 true'
+; RUN:    llvm-dis | grep {ret i1 true}
 implementation
 
 internal int %foo(bool %C) {

diff --git a/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll b/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
index 8fcd8e4..1356266 100644 (file)
--- a/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
+++ b/test/Transforms/IndVarsSimplify/2005-02-26-ExitValueCompute.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret i32 152'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | \
+; RUN:   grep {ret i32 152}
 
 int %main() {
 entry:

diff --git a/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll b/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
index deb9abd..b2860fd 100644 (file)
--- a/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
+++ b/test/Transforms/IndVarsSimplify/2006-03-31-NegativeStride.ll
@@ -1,7 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep 'ret i32 27'
+; PR726
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | \
+; RUN:   grep {ret i32 27}
 
 ; Make sure to compute the right exit value based on negative strides.
-; PR726
 
 int %test() {
 entry:

diff --git a/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll b/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll
index 8dc5b88..dd151e8 100644 (file)
--- a/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll
+++ b/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-as < %s | opt -indvars -disable-output &&
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | not grep 'ret i32 0'
 ; PR1015
+; RUN: llvm-as < %s | opt -indvars | llvm-dis | not grep {ret i32 0}
 
 target datalayout = "e-p:32:32"
 target triple = "i686-apple-darwin8"

diff --git a/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll b/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll
index a80d6d9..f1d0187 100644 (file)
--- a/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll
+++ b/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86-64 | grep '(%rdi,%rax,8)' &&
-; RUN: llvm-as < %s | llc -march=x86-64 | not grep 'addq.*8'
+; RUN: llvm-as < %s | llc -march=x86-64 | grep {(%rdi,%rax,8)}
+; RUN: llvm-as < %s | llc -march=x86-64 | not grep {addq.*8}
 
 define void @foo(double* %y) {
 entry:

diff --git a/test/Transforms/IndVarsSimplify/dg.exp b/test/Transforms/IndVarsSimplify/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/IndVarsSimplify/dg.exp
+++ b/test/Transforms/IndVarsSimplify/dg.exp
@@ -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}]]

diff --git a/test/Transforms/IndVarsSimplify/exit_value_tests.llx b/test/Transforms/IndVarsSimplify/exit_value_tests.llx
index 7d5d366..4e15fc3 100644 (file)
--- a/test/Transforms/IndVarsSimplify/exit_value_tests.llx
+++ b/test/Transforms/IndVarsSimplify/exit_value_tests.llx
@@ -2,7 +2,8 @@
 ; these loops all have predictable exit values we can replace the use outside
 ; of the loop with a closed-form computation, making the loop dead.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -adce -simplifycfg | \
+; RUN:   llvm-dis | not grep br
 
 int %polynomial_constant() {
         br label %Loop

diff --git a/test/Transforms/IndVarsSimplify/loop_evaluate_3.ll b/test/Transforms/IndVarsSimplify/loop_evaluate_3.ll
index 155e8b4..2a2f69d 100644 (file)
--- a/test/Transforms/IndVarsSimplify/loop_evaluate_3.ll
+++ b/test/Transforms/IndVarsSimplify/loop_evaluate_3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep 'ret i32 600000'
+; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep {ret i32 600000}
 ; PR1179
 
 define i32 @foo() {

diff --git a/test/Transforms/IndVarsSimplify/loop_evaluate_4.ll b/test/Transforms/IndVarsSimplify/loop_evaluate_4.ll
index feb56ed..6c6a362 100644 (file)
--- a/test/Transforms/IndVarsSimplify/loop_evaluate_4.ll
+++ b/test/Transforms/IndVarsSimplify/loop_evaluate_4.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep 'ret i32 9900'
+; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep {ret i32 9900}
 ; PR1179
 
 define i32 @test4() {

diff --git a/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll b/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll
index d464cfa..e112757 100644 (file)
--- a/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll
+++ b/test/Transforms/IndVarsSimplify/variable-stride-ivs.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -instcombine | llvm-dis | grep 'store i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars -instcombine | llvm-dis | \
+; RUN:   grep {store i32 0}
+; END.
 ; Test that -indvars can reduce variable stride IVs.  If it can reduce variable
 ; stride iv's, it will make %iv. and %m.0.0 isomorphic to each other without 
 ; cycles, allowing the tmp.21 subtraction to be eliminated.

diff --git a/test/Transforms/Inline/casts.ll b/test/Transforms/Inline/casts.ll
index e7b1744..340b978 100644 (file)
--- a/test/Transforms/Inline/casts.ll
+++ b/test/Transforms/Inline/casts.ll
@@ -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:

diff --git a/test/Transforms/Inline/dg.exp b/test/Transforms/Inline/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/Inline/dg.exp
+++ b/test/Transforms/Inline/dg.exp
@@ -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}]]

diff --git a/test/Transforms/Inline/inline_cleanup.ll b/test/Transforms/Inline/inline_cleanup.ll
index f0c153b..2ec67ff 100644 (file)
--- a/test/Transforms/Inline/inline_cleanup.ll
+++ b/test/Transforms/Inline/inline_cleanup.ll
@@ -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]

diff --git a/test/Transforms/Inline/inline_constprop.ll b/test/Transforms/Inline/inline_constprop.ll
index d76a88b..4b183e2 100644 (file)
--- a/test/Transforms/Inline/inline_constprop.ll
+++ b/test/Transforms/Inline/inline_constprop.ll
@@ -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

diff --git a/test/Transforms/Inline/inline_dce.ll b/test/Transforms/Inline/inline_dce.ll
index 9dc7a77..5cb118f 100644 (file)
--- a/test/Transforms/Inline/inline_dce.ll
+++ b/test/Transforms/Inline/inline_dce.ll
@@ -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
 

diff --git a/test/Transforms/Inline/inline_prune.ll b/test/Transforms/Inline/inline_prune.ll
index dff3880..85a6343 100644 (file)
--- a/test/Transforms/Inline/inline_prune.ll
+++ b/test/Transforms/Inline/inline_prune.ll
@@ -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

diff --git a/test/Transforms/Inline/invoke_test-1.ll b/test/Transforms/Inline/invoke_test-1.ll
index 8409a21..9e69018 100644 (file)
--- a/test/Transforms/Inline/invoke_test-1.ll
+++ b/test/Transforms/Inline/invoke_test-1.ll
@@ -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()
 

diff --git a/test/Transforms/Inline/invoke_test-2.ll b/test/Transforms/Inline/invoke_test-2.ll
index 0913f7c..9262090 100644 (file)
--- a/test/Transforms/Inline/invoke_test-2.ll
+++ b/test/Transforms/Inline/invoke_test-2.ll
@@ -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()
 

diff --git a/test/Transforms/LCSSA/dg.exp b/test/Transforms/LCSSA/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LCSSA/dg.exp
+++ b/test/Transforms/LCSSA/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
index 96e11c3..365cb1f 100644 (file)
--- a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
+++ b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
@@ -3,7 +3,8 @@
 ; happens because preheader insertion doesn't insert a preheader for this
 ; case... bad.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br '
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -adce -simplifycfg | llvm-dis | \
+; RUN:   not grep {br }
 
 int %main(int %argc) {
         br label %bb5

diff --git a/test/Transforms/LICM/dg.exp b/test/Transforms/LICM/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LICM/dg.exp
+++ b/test/Transforms/LICM/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LICM/sink_multiple.ll b/test/Transforms/LICM/sink_multiple.ll
index 61cf690..49b35b6 100644 (file)
--- a/test/Transforms/LICM/sink_multiple.ll
+++ b/test/Transforms/LICM/sink_multiple.ll
@@ -3,7 +3,8 @@
 ; instructions from the loop.  Instead they got hoisted, which is better than
 ; leaving them in the loop, but increases register pressure pointlessly.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext getelementptr 1 | grep Out:
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | \
+; RUN:    %prcontext getelementptr 1 | grep Out:
 
 %Ty = type { int, int }
 %X = external global %Ty

diff --git a/test/Transforms/LICM/sink_multiple_exits.ll b/test/Transforms/LICM/sink_multiple_exits.ll
index 860d730..75cfed7 100644 (file)
--- a/test/Transforms/LICM/sink_multiple_exits.ll
+++ b/test/Transforms/LICM/sink_multiple_exits.ll
@@ -1,7 +1,8 @@
 ; This testcase ensures that we can sink instructions from loops with
 ; multiple exits.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext mul 1 | grep 'Out[12]:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | \
+; RUN:    %prcontext mul 1 | grep {Out\[12\]:}
 
 int %test(int %N, bool %C) {
 Entry:

diff --git a/test/Transforms/LICM/sink_only_some_exits.ll b/test/Transforms/LICM/sink_only_some_exits.ll
index e82166a..ae11fe8 100644 (file)
--- a/test/Transforms/LICM/sink_only_some_exits.ll
+++ b/test/Transforms/LICM/sink_only_some_exits.ll
@@ -2,7 +2,8 @@
 ; some exits out of the loop, and that we can do so without breaking dominator
 ; info.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep exit2:
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | \
+; RUN:   %prcontext add 1 | grep exit2:
 
 implementation   ; Functions:
 

diff --git a/test/Transforms/LoopRotate/dg.exp b/test/Transforms/LoopRotate/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LoopRotate/dg.exp
+++ b/test/Transforms/LoopRotate/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LoopRotate/pr1154.ll b/test/Transforms/LoopRotate/pr1154.ll
index c417710..09c9405 100644 (file)
--- a/test/Transforms/LoopRotate/pr1154.ll
+++ b/test/Transforms/LoopRotate/pr1154.ll
@@ -1,4 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -std-compile-opts | llvm-dis | %prcontext strstr 2 | grep -v declare |grep "bb36.outer:"
+; RUN: llvm-upgrade < %s | llvm-as | opt -std-compile-opts | llvm-dis | \
+; RUN:   %prcontext strstr 2 | grep -v declare | grep bb36.outer:
+; END.
+
 @str = internal constant [68 x i8] c"Dot. date. datum. 123. Some more doubtful demonstration dummy data.\00"           ; <[68 x i8]*> [#uses=1]
 @str1 = internal constant [5 x i8] c"ummy\00"          ; <[5 x i8]*> [#uses=1]
 @str2 = internal constant [6 x i8] c" data\00"         ; <[6 x i8]*> [#uses=1]

diff --git a/test/Transforms/LoopSimplify/dg.exp b/test/Transforms/LoopSimplify/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LoopSimplify/dg.exp
+++ b/test/Transforms/LoopSimplify/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LoopStrengthReduce/dg.exp b/test/Transforms/LoopStrengthReduce/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/dg.exp
+++ b/test/Transforms/LoopStrengthReduce/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll b/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
index b8f318b..3c1003b 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
+++ b/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'cast uint 1 to uint'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN:   not grep {cast uint 1 to uint}
+; END.
 ; The setlt wants to use a value that is incremented one more than the dominant
 ; IV.  Don't insert the 1 outside the loop, preventing folding it into the add.
 

diff --git a/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll b/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
index 79beb0b..4c31a98 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
+++ b/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
@@ -3,7 +3,7 @@
 ; instruction immediately before the conditional branch.
 ;
 ; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
-; RUN:    %prcontext 'br i1' 1 | grep icmp
+; RUN:    %prcontext {br i1} 1 | grep icmp
 
 void %foo(float* %D, uint %E) {
 entry:

diff --git a/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll b/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
index 028400c..195f0b2 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
+++ b/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep 'add i32 %iv.*inc, 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN:   grep {add i32 %iv.*inc, 1}
 ;
 ; Make sure that the use of the IV outside of the loop (the store) uses the 
 ; post incremented value of the IV, not the preincremented value.  This 

diff --git a/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll b/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
index 3e8f63a..1daa403 100644 (file)
--- a/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
+++ b/test/Transforms/LoopStrengthReduce/var_stride_used_by_compare.ll
@@ -1,10 +1,11 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis &&
-
 ; Base should not be i*3, it should be i*2.
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'mul.*%i, 3' &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN:   not grep {mul.*%i, 3} 
 
 ; Indvar should not start at zero:
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep 'phi uint .* 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN:   not grep {phi uint .* 0}
+; END.
 
 ; mul uint %i, 3
 

diff --git a/test/Transforms/LoopUnroll/dg.exp b/test/Transforms/LoopUnroll/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LoopUnroll/dg.exp
+++ b/test/Transforms/LoopUnroll/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LoopUnswitch/dg.exp b/test/Transforms/LoopUnswitch/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LoopUnswitch/dg.exp
+++ b/test/Transforms/LoopUnswitch/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LowerInvoke/dg.exp b/test/Transforms/LowerInvoke/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LowerInvoke/dg.exp
+++ b/test/Transforms/LowerInvoke/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LowerSetJmp/dg.exp b/test/Transforms/LowerSetJmp/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LowerSetJmp/dg.exp
+++ b/test/Transforms/LowerSetJmp/dg.exp
@@ -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}]]

diff --git a/test/Transforms/LowerSwitch/dg.exp b/test/Transforms/LowerSwitch/dg.exp
index ff34508..879685c 100644 (file)
--- a/test/Transforms/LowerSwitch/dg.exp
+++ b/test/Transforms/LowerSwitch/dg.exp
@@ -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}]]