5 files changed, 10 insertions, 6 deletions
diff --git a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
index 96e11c3..365cb1f 100644
--- a/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
+++ b/test/Transforms/LICM/2003-02-27-PreheaderProblem.ll
@@ -3,7 +3,8 @@
 ; happens because preheader insertion doesn't insert a preheader for this
 ; case... bad.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm -adce -simplifycfg | llvm-dis | not grep 'br '
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm -adce -simplifycfg | llvm-dis | \
+; RUN:   not grep {br }
 
 int %main(int %argc) {
         br label %bb5
diff --git a/test/Transforms/LICM/dg.exp b/test/Transforms/LICM/dg.exp
index ff34508..879685c 100644
--- a/test/Transforms/LICM/dg.exp
+++ b/test/Transforms/LICM/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/LICM/sink_multiple.ll b/test/Transforms/LICM/sink_multiple.ll
index 61cf690..49b35b6 100644
--- a/test/Transforms/LICM/sink_multiple.ll
+++ b/test/Transforms/LICM/sink_multiple.ll
@@ -3,7 +3,8 @@
 ; instructions from the loop.  Instead they got hoisted, which is better than
 ; leaving them in the loop, but increases register pressure pointlessly.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext getelementptr 1 | grep Out:
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | \
+; RUN:    %prcontext getelementptr 1 | grep Out:
 
 %Ty = type { int, int }
 %X = external global %Ty
diff --git a/test/Transforms/LICM/sink_multiple_exits.ll b/test/Transforms/LICM/sink_multiple_exits.ll
index 860d730..75cfed7 100644
--- a/test/Transforms/LICM/sink_multiple_exits.ll
+++ b/test/Transforms/LICM/sink_multiple_exits.ll
@@ -1,7 +1,8 @@
 ; This testcase ensures that we can sink instructions from loops with
 ; multiple exits.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext mul 1 | grep 'Out[12]:'
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | \
+; RUN:    %prcontext mul 1 | grep {Out\[12\]:}
 
 int %test(int %N, bool %C) {
 Entry:
diff --git a/test/Transforms/LICM/sink_only_some_exits.ll b/test/Transforms/LICM/sink_only_some_exits.ll
index e82166a..ae11fe8 100644
--- a/test/Transforms/LICM/sink_only_some_exits.ll
+++ b/test/Transforms/LICM/sink_only_some_exits.ll
@@ -2,7 +2,8 @@
 ; some exits out of the loop, and that we can do so without breaking dominator
 ; info.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | %prcontext add 1 | grep exit2:
+; RUN: llvm-upgrade < %s | llvm-as | opt -licm | llvm-dis | \
+; RUN:   %prcontext add 1 | grep exit2:
 
 implementation   ; Functions: