For PR1319: Upgrade to new test harness

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

diff --git a/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll b/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
index 34c2d03b4bc7ed92e825c531f7fdcd2374431ca6..e266be9a7fde94999ea400ab47c6b9853bed2cbe 100644 (file)
--- a/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
+++ b/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as -f %s -o %t.bc
-; RUN: lli -debug-only=jit %t.bc 2>&1 | not grep 'Finished CodeGen of .*Function: F'
+; RUN: llvm-upgrade %s | llvm-as -f -o %t.bc
+; RUN: lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
 
 %.str_1 = internal constant [7 x sbyte] c"IN F!\0A\00"         ; <[7 x sbyte]*> [#uses=1]
 %.str_2 = internal constant [7 x sbyte] c"IN G!\0A\00"         ; <[7 x sbyte]*> [#uses=1]

diff --git a/test/ExecutionEngine/dg.exp b/test/ExecutionEngine/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..879685ca879df60056ae48bf4411e0df73b77dc5 100644 (file)
--- a/test/ExecutionEngine/dg.exp
+++ b/test/ExecutionEngine/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/Other/2003-02-19-LoopInfoNestingBug.ll b/test/Other/2003-02-19-LoopInfoNestingBug.ll
index bf71f5f22e10e5d9c0ea7d8ad44e348289d54e14..ebad6baa371d20888dc6e590a9c5bd4ca334b90b 100644 (file)
--- a/test/Other/2003-02-19-LoopInfoNestingBug.ll
+++ b/test/Other/2003-02-19-LoopInfoNestingBug.ll
@@ -2,7 +2,8 @@
 ; figure out that loop "Inner" should be nested inside of leep "LoopHeader", 
 ; and instead nests it just inside loop "Top"
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | grep '     Loop Containing:[ ]*%Inner'
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | \
+; RUN:   grep {     Loop Containing:\[ \]*%Inner}
 ;
 
 implementation

diff --git a/test/Other/dg.exp b/test/Other/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..879685ca879df60056ae48bf4411e0df73b77dc5 100644 (file)
--- a/test/Other/dg.exp
+++ b/test/Other/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/TableGen/Include.td b/test/TableGen/Include.td
index fe9ecb05d53d89ba5397a59df106d71c5151cfae..29ed5150c622c7082f7c4a3016433d5badc57e79 100644 (file)
--- a/test/TableGen/Include.td
+++ b/test/TableGen/Include.td
@@ -1,4 +1,4 @@
-// RUN: tblgen -I `dirname %s` %s
+// RUN: tblgen -I %p %s
 def BeforeInclude;
 
 include "Include.inc"

diff --git a/test/TableGen/LazyChange.td b/test/TableGen/LazyChange.td
index c3e54de0a8b975ff35cf231adf9b8eff9c5d2be9..145fd0bb79f3c9a25cff6d8a275d5edd15c604dc 100644 (file)
--- a/test/TableGen/LazyChange.td
+++ b/test/TableGen/LazyChange.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep 'int Y = 3'
+// RUN: tblgen %s | grep {int Y = 3}
 
 
 class C {

diff --git a/test/TableGen/MultiClass.td b/test/TableGen/MultiClass.td
index 2840e6742e63a6fd72ca9812f73a32e2227ead22..41019eb675df0854a648b8de28ec8efc2167074c 100644 (file)
--- a/test/TableGen/MultiClass.td
+++ b/test/TableGen/MultiClass.td
@@ -1,5 +1,4 @@
-// RUN: tblgen %s &&
-// RUN: tblgen %s | grep 'zing = 4' | wc -l | grep 2
+// RUN: tblgen %s | grep {zing = 4} | wc -l | grep 2
 
 class C1<int A, string B> { 
   int bar = A;

diff --git a/test/TableGen/dg.exp b/test/TableGen/dg.exp
index 83159616d401fec5f630a599a4010a7bbde42c47..f7d275ad8cb1ea02cccf9722afe338e0bb085adb 100644 (file)
--- a/test/TableGen/dg.exp
+++ b/test/TableGen/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]

diff --git a/test/Verifier/2006-10-15-AddrLabel.ll b/test/Verifier/2006-10-15-AddrLabel.ll
index fb9acf19e07bcc386e85ad28a945cb039f13e2bd..173b0cf9a7116a412fadf7b2116d79e419e5a872 100644 (file)
--- a/test/Verifier/2006-10-15-AddrLabel.ll
+++ b/test/Verifier/2006-10-15-AddrLabel.ll
@@ -1,6 +1,5 @@
-; RUN: not llvm-as 2>&1 < %s > /dev/null &&
-; RUN: llvm-as 2>&1 < %s > /dev/null | \
-; RUN:    grep 'Cannot form a pointer to a basic block'
+; RUN: ignore llvm-as < %s > /dev/null |& \
+; RUN:    grep {Cannot form a pointer to a basic block}
 
 define i32 @main() {
          %foo  = call i8* %llvm.stacksave()

diff --git a/test/Verifier/dg.exp b/test/Verifier/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..879685ca879df60056ae48bf4411e0df73b77dc5 100644 (file)
--- a/test/Verifier/dg.exp
+++ b/test/Verifier/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}]]