From b477f7dd651b7943748b6efdc9791f09afc8d472 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sun, 15 Apr 2007 09:31:07 +0000
Subject: [PATCH] For PR1319: Upgrade to use new Tcl exec based test harness.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36066 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll | 4 +++-
 test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll        | 3 ++-
 test/Analysis/Dominators/dg.exp                              | 4 ++--
 test/Analysis/GlobalsModRef/dg.exp                           | 4 ++--
 test/Analysis/GlobalsModRef/indirect-global.ll               | 3 ++-
 test/Analysis/LoadVN/casts.ll                                | 2 +-
 test/Analysis/LoadVN/dg.exp                                  | 4 ++--
 test/Analysis/LoopInfo/dg.exp                                | 4 ++--
 test/Analysis/ScalarEvolution/dg.exp                         | 4 ++--
 test/Analysis/ScalarEvolution/trip-count.ll                  | 4 ++--
 10 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll b/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
index 36385e2b207..719150dd31d 100644
--- a/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
+++ b/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier -disable-verify
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier \
+; RUN:   -disable-verify
+; END.
 ;
 ; ModuleID = '2006-09-26-PostDominanceFrontier.bc'
 target endian = little
diff --git a/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll b/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
index e7bb43e97f4..40d276087df 100644
--- a/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
+++ b/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze -domtree | grep '3.*%brtrue$'
+; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze \
+; RUN:  -domtree | grep {3.*%brtrue$}
 ; PR932
 implementation   ; Functions:
 
diff --git a/test/Analysis/Dominators/dg.exp b/test/Analysis/Dominators/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/test/Analysis/Dominators/dg.exp
+++ b/test/Analysis/Dominators/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/Analysis/GlobalsModRef/dg.exp b/test/Analysis/GlobalsModRef/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/test/Analysis/GlobalsModRef/dg.exp
+++ b/test/Analysis/GlobalsModRef/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/Analysis/GlobalsModRef/indirect-global.ll b/test/Analysis/GlobalsModRef/indirect-global.ll
index bb75732bebb..0ab82aefb8b 100644
--- a/test/Analysis/GlobalsModRef/indirect-global.ll
+++ b/test/Analysis/GlobalsModRef/indirect-global.ll
@@ -1,6 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | \
-; RUN:   grep 'ret i32 0'
+; RUN:   grep {ret i32 0}
+; END.
 %G = internal global int* null
 
 implementation
diff --git a/test/Analysis/LoadVN/casts.ll b/test/Analysis/LoadVN/casts.ll
index 9b8f6a59999..3da4d573019 100644
--- a/test/Analysis/LoadVN/casts.ll
+++ b/test/Analysis/LoadVN/casts.ll
@@ -1,7 +1,7 @@
 ; Check to make sure that Value Numbering doesn't merge casts of different
 ; flavors.
 ; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | \
-; RUN:   grep '[sz]ext' | wc -l | grep 2
+; RUN:   grep {\[sz\]ext} | wc -l | grep 2
 
 declare void %external(int)
 
diff --git a/test/Analysis/LoadVN/dg.exp b/test/Analysis/LoadVN/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/test/Analysis/LoadVN/dg.exp
+++ b/test/Analysis/LoadVN/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/Analysis/LoopInfo/dg.exp b/test/Analysis/LoopInfo/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/test/Analysis/LoopInfo/dg.exp
+++ b/test/Analysis/LoopInfo/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/Analysis/ScalarEvolution/dg.exp b/test/Analysis/ScalarEvolution/dg.exp
index 0abedddac68..b65a2503ac6 100644
--- a/test/Analysis/ScalarEvolution/dg.exp
+++ b/test/Analysis/ScalarEvolution/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.ll]] 
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.ll]] 
diff --git a/test/Analysis/ScalarEvolution/trip-count.ll b/test/Analysis/ScalarEvolution/trip-count.ll
index 671aba574c8..a689e71eaa3 100644
--- a/test/Analysis/ScalarEvolution/trip-count.ll
+++ b/test/Analysis/ScalarEvolution/trip-count.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | \
-; RUN:   grep '10000 iterations'
+; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& \
+; RUN:   grep {10000 iterations}
 ; PR1101
 
 @A = weak global [1000 x i32] zeroinitializer, align 32