For PR1319: Upgrade to new test harness

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

diff --git a/test/Bytecode/2006-12-11-Cast-ConstExpr.ll b/test/Bytecode/2006-12-11-Cast-ConstExpr.ll
index aa2cf93..4c768d6 100644 (file)
--- a/test/Bytecode/2006-12-11-Cast-ConstExpr.ll
+++ b/test/Bytecode/2006-12-11-Cast-ConstExpr.ll
@@ -1,6 +1,8 @@
 ; This test ensures that we get a bitcast constant expression in and out,
 ; not a sitofp constant expression. 
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 'bitcast ('
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
+; RUN:   grep {bitcast (}
+
 %G = external global int
 
 float %tryit(int %A) {

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