For PR1319:

Convert to use the new Tcl expr based test harness.


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

6 files changed, 15 insertions, 9 deletions

diff --git a/test/Transforms/CorrelatedExprs/basictest.ll b/test/Transforms/CorrelatedExprs/basictest.ll
index b403c30c97..0f41d24f47 100644
--- a/test/Transforms/CorrelatedExprs/basictest.ll
+++ b/test/Transforms/CorrelatedExprs/basictest.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | \
+; RUN:   llvm-dis | not grep REMOVE
 
 int %test1(int %A) {
 	%cond = seteq int %A, 40
diff --git a/test/Transforms/CorrelatedExprs/dg.exp b/test/Transforms/CorrelatedExprs/dg.exp
index ff34508c3c..879685ca87 100644
--- a/test/Transforms/CorrelatedExprs/dg.exp
+++ b/test/Transforms/CorrelatedExprs/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/CorrelatedExprs/looptest.ll b/test/Transforms/CorrelatedExprs/looptest.ll
index eca6d93ad6..d1ad4346de 100644
--- a/test/Transforms/CorrelatedExprs/looptest.ll
+++ b/test/Transforms/CorrelatedExprs/looptest.ll
@@ -12,8 +12,9 @@
 ; Note that this is a "feature" test, not a correctness test.
 ;
 ; XFAIL: *
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | not grep cond213
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | \
+; RUN:   not grep cond213
+; END.
 ;
 implementation   ; Functions:
 
diff --git a/test/Transforms/CorrelatedExprs/nullpointer.ll b/test/Transforms/CorrelatedExprs/nullpointer.ll
index a0fcdda129..88a0c0e5f4 100644
--- a/test/Transforms/CorrelatedExprs/nullpointer.ll
+++ b/test/Transforms/CorrelatedExprs/nullpointer.ll
@@ -2,8 +2,9 @@
 ; Any succeeding uses of the pointer should get this info
 ;
 ; XFAIL: *
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | \
+; RUN:   llvm-dis | not grep br
+; END.
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/CorrelatedExprs/switch.ll b/test/Transforms/CorrelatedExprs/switch.ll
index d8fad3e190..24b34b03a7 100644
--- a/test/Transforms/CorrelatedExprs/switch.ll
+++ b/test/Transforms/CorrelatedExprs/switch.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | \
+; RUN:   llvm-dis | not grep REMOVE
+; END.
 
 int %test_case_values_should_propagate(int %A) {
     switch int %A, label %D [
diff --git a/test/Transforms/CorrelatedExprs/whet.ll b/test/Transforms/CorrelatedExprs/whet.ll
index ded1e1996a..aede00288b 100644
--- a/test/Transforms/CorrelatedExprs/whet.ll
+++ b/test/Transforms/CorrelatedExprs/whet.ll
@@ -11,7 +11,8 @@
 ;
 ; This should eliminate all BB's except BB0, BB9, BB10
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | \
+; RUN:   llvm-dis | not grep {bb\[2-8\]}
 
 implementation   ; Functions: