Use the bit size of the operand instead of the hard-coded 32 to generate the

[oota-llvm.git] / test / lib / llvm.exp

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index 05c910771ad16ba5b3849178d9ed9d76294c1a93..b59f341d72b1f0e3fe41018fdbe8cdb22aa4ccdf 100644 (file)
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -56,10 +56,10 @@ proc substitute { line test tmpFile } {
   regsub -all {%llvmgcc} $new_line "$llvmgcc -emit-llvm" new_line
   #replace %llvmgxx with actual path to llvmg++
   regsub -all {%llvmgxx} $new_line "$llvmgxx -emit-llvm" new_line
-  #replace %compile_c with C compilation command
-  regsub -all {%compile_c} $new_line "$compile_c" new_line
   #replace %compile_cxx with C++ compilation command
   regsub -all {%compile_cxx} $new_line "$compile_cxx" new_line
+  #replace %compile_c with C compilation command
+  regsub -all {%compile_c} $new_line "$compile_c" new_line
   #replace %link with C++ link command
   regsub -all {%link} $new_line "$link" new_line
   #replace %shlibext with shared library extension
@@ -102,6 +102,7 @@ proc RunLLVMTests { test_source_files } {
     #set timeout 40
     
     set filename [file tail $test]
+    verbose "ABOUT TO RUN: $filename" 2
     set outcome PASS
     set tmpFile "$filename.tmp"
     
@@ -118,7 +119,7 @@ proc RunLLVMTests { test_source_files } {
     foreach line [split [read $testFileId] \n] {
 
       # if its the END. line then stop parsing (optimization for big files)
-      if {[regexp {END.[ *]$} $line match endofscript]} {
+      if {[regexp {END.[[:space:]]*$} $line match endofscript]} {        
         break
 
       # if the line is continued, concatenate and continue the loop