For PR1319:
Upgrade to use new Tcl exec based test harness. This exposes 3 bugs that
were previously not being reported:
test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll
test/Transforms/GlobalOpt/memset.ll
test/Transforms/IndVarsSimplify/exit_value_tests.llx
llvm-svn: 36065
diff --git a/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll b/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
index 4583769..7ddad0b 100644
--- a/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
+++ b/llvm/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'ret i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis |\
+; RUN: grep {ret i32 0}
int %f(int %a0, int %a1, int %a2, int %a3, int %a4) {
%tmp.2 = add int %a4, %a3 ; <int> [#uses=1]
diff --git a/llvm/test/Transforms/Reassociate/dg.exp b/llvm/test/Transforms/Reassociate/dg.exp
index ff34508..879685c 100644
--- a/llvm/test/Transforms/Reassociate/dg.exp
+++ b/llvm/test/Transforms/Reassociate/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/llvm/test/Transforms/Reassociate/mul-neg-add.ll b/llvm/test/Transforms/Reassociate/mul-neg-add.ll
index d7c39a5..4219044 100644
--- a/llvm/test/Transforms/Reassociate/mul-neg-add.ll
+++ b/llvm/test/Transforms/Reassociate/mul-neg-add.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | not grep 'sub int 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis |\
+; RUN: not grep {sub i32 0}
int %test(int %X, int %Y, int %Z) {
%A = sub int 0, %X
diff --git a/llvm/test/Transforms/Reassociate/shifttest.ll b/llvm/test/Transforms/Reassociate/shifttest.ll
index 18c6e4e..3603604 100644
--- a/llvm/test/Transforms/Reassociate/shifttest.ll
+++ b/llvm/test/Transforms/Reassociate/shifttest.ll
@@ -1,6 +1,7 @@
; With shl->mul reassociation, we can see that this is (shl A, 9) * A
;
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep 'shl .*, 9'
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis |\
+; RUN: grep {shl .*, 9}
int %test(int %A, int %B) {
%X = shl int %A, ubyte 5