For PR1319:

Upgrade to use new Tcl exec based test harness

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

diff --git a/test/Transforms/BlockPlacement/dg.exp b/test/Transforms/BlockPlacement/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..879685ca879df60056ae48bf4411e0df73b77dc5 100644 (file)
--- a/test/Transforms/BlockPlacement/dg.exp
+++ b/test/Transforms/BlockPlacement/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/CodeExtractor/dg.exp b/test/Transforms/CodeExtractor/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..879685ca879df60056ae48bf4411e0df73b77dc5 100644 (file)
--- a/test/Transforms/CodeExtractor/dg.exp
+++ b/test/Transforms/CodeExtractor/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/CondProp/basictest.ll b/test/Transforms/CondProp/basictest.ll
index adc16f8cdd75c6743dada16ab4339dcca0330df3..1e2a93664a4885713a1da7d4eac3fee1eaed41b5 100644 (file)
--- a/test/Transforms/CondProp/basictest.ll
+++ b/test/Transforms/CondProp/basictest.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep 'br label'
+; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | \
+; RUN:    not grep {br label}
 
 int %test(bool %C) {
        br bool %C, label %T1, label %F1

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