Changes to fix problems with "make check". Apparently you can redefine

functions and Tcl's just tickled with that. The fix is to give the "new"
test system a different interface function name.


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

7 files changed, 11 insertions, 9 deletions

diff --git a/test/Analysis/Andersens/dg.exp b/test/Analysis/Andersens/dg.exp
index 44f3bca473..a40d51c84f 100644
--- a/test/Analysis/Andersens/dg.exp
+++ b/test/Analysis/Andersens/dg.exp
@@ -1,4 +1,4 @@
 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/Analysis/BasicAA/dg.exp b/test/Analysis/BasicAA/dg.exp
index 694e4fdd88..879685ca87 100644
--- a/test/Analysis/BasicAA/dg.exp
+++ b/test/Analysis/BasicAA/dg.exp
@@ -1,3 +1,3 @@
 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/Feature/dg.exp b/test/Feature/dg.exp
index 694e4fdd88..879685ca87 100644
--- a/test/Feature/dg.exp
+++ b/test/Feature/dg.exp
@@ -1,3 +1,3 @@
 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/Integer/dg.exp b/test/Integer/dg.exp
index 694e4fdd88..879685ca87 100644
--- a/test/Integer/dg.exp
+++ b/test/Integer/dg.exp
@@ -1,3 +1,3 @@
 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/InstCombine/2004-08-10-BoolSetCC.ll b/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
index 0a0038f217..e87e42c198 100644
--- a/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
+++ b/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep {ret i1 false}
+; RUN:    grep {ret i1 false}
 bool %test(bool %V) {
 	%Y = setlt bool %V, false
 	ret bool %Y
diff --git a/test/Transforms/InstCombine/dg.exp b/test/Transforms/InstCombine/dg.exp
index 694e4fdd88..879685ca87 100644
--- a/test/Transforms/InstCombine/dg.exp
+++ b/test/Transforms/InstCombine/dg.exp
@@ -1,3 +1,3 @@
 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/lib/llvm.exp b/test/lib/llvm.exp
index c5d4ffe9bf..ab7c994948 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -40,8 +40,10 @@ proc execOneLine { test PRS outcome lineno line } {
 
 proc substitute { line test tmpFile } {
   global srcroot objroot srcdir objdir subdir target_triplet prcontext 
-  global llvmgcc llvmgxx global llvmgcc_version llvmgccmajvers 
+  global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers 
   global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
+  set path [file join $srcdir $subdir]
+  set tmp  [file join Output $tmpFile]
 
   set new_line $line
   #replace %prcontext with prcontext.tcl (Must replace before %p)
@@ -69,7 +71,7 @@ proc substitute { line test tmpFile } {
   return $new_line
 }
 
-proc llvm-runtest { programs } {
+proc RunLLVMTests { test_source_files } {
   global srcroot objroot srcdir objdir subdir target_triplet
   set timeout 60
 
@@ -85,7 +87,7 @@ proc llvm-runtest { programs } {
   
   file mkdir Output
 
-  foreach test $programs {
+  foreach test $test_source_files {
     #Should figure out best way to set the timeout
     #set timeout 40