Use toplevel function pass manager as OnTheFly manager.

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

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index ab7c994948a42c580153009681df8f5d66eb95bd..4fc9c4aa5e1e0c26b25607456e9eaaa6a3f5669e 100644 (file)
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -1,3 +1,4 @@
+# This procedure executes one line of a test case's execution script.
 proc execOneLine { test PRS outcome lineno line } {
   set status 0
   set resultmsg ""
@@ -8,26 +9,26 @@ proc execOneLine { test PRS outcome lineno line } {
     if { $PRS != ""} {
       set PRS " for $PRS" 
     }
-    set errmsg " at line $lineno$PRS\nwhile running: $line\n$errmsg"
+    set errmsg " at line $lineno\nwhile running: $line\n$errmsg"
     switch "$code" {
       CHILDSTATUS {
         set status [lindex $::errorCode 2]
-        if { $status ne 0 } {
-          set resultmsg "$test: exit($status)$errmsg"
+        if { $status != 0 } {
+          set resultmsg "$test$PRS\nFailed with exit($status)$errmsg"
         }
       }
       CHILDKILLED {
         set signal [lindex $::errorCode 2]
-        set resultmsg "$test: signal($signal)$errmsg"
+        set resultmsg "$test$PRS\nFailed with signal($signal)$errmsg"
       }
       CHILDSUSP {
         set signal [lindex $::errorCode 2]
-        set resultmsg "$test: suspend($signal)$errmsg"
+        set resultmsg "$test$PRS\nFailed with suspend($signal)$errmsg"
       }
       POSIX {
         set posixNum [lindex $::errorCode 1]
         set posixMsg [lindex $::errorCode 2]
-        set resultmsg "$test: posix($posixNum,$posixMsg)$errmsg"
+        set resultmsg "$test$PRS\nFailed with posix($posixNum,$posixMsg)$errmsg"
       }
       NONE {
       }
@@ -38,6 +39,8 @@ proc execOneLine { test PRS outcome lineno line } {
   return $resultmsg
 }
 
+# This prcoedure performs variable substitutions on the RUN: lines of a test
+# cases.
 proc substitute { line test tmpFile } {
   global srcroot objroot srcdir objdir subdir target_triplet prcontext 
   global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers 
@@ -45,7 +48,9 @@ proc substitute { line test tmpFile } {
   set path [file join $srcdir $subdir]
   set tmp  [file join Output $tmpFile]
 
-  set new_line $line
+  # Substitute all Tcl variables.
+  set new_line [subst $line ]
+
   #replace %prcontext with prcontext.tcl (Must replace before %p)
   regsub -all {%prcontext} $new_line $prcontext new_line
   #replace %llvmgcc with actual path to llvmgcc
@@ -68,11 +73,14 @@ proc substitute { line test tmpFile } {
   regsub -all {%s} $new_line $test new_line
   #replace %t with temp filenames
   regsub -all {%t} $new_line [file join Output $tmpFile] new_line
+  #replace %% with %
+  regsub -all {%%} $new_line % new_line
   return $new_line
 }
 
+# This procedure runs the set of tests for the test_source_files array.
 proc RunLLVMTests { test_source_files } {
-  global srcroot objroot srcdir objdir subdir target_triplet
+  global srcroot objroot srcdir objdir subdir target_triplet llvmgcc_version
   set timeout 60
 
   set path [file join $objdir $subdir]
@@ -108,8 +116,8 @@ proc RunLLVMTests { test_source_files } {
       if {[regexp {END.[ *]$} $line match endofscript]} {
         break
 
-      # if the line is continued, concatente and continue the loop
-      } elseif {[regexp {RUN: *([^\\]+)(\\)$} $line match oneline suffix]} {
+      # if the line is continued, concatenate and continue the loop
+      } elseif {[regexp {RUN: *(.+)(\\)$} $line match oneline suffix]} {
         set runline "$runline$oneline "
 
       # if its a terminating RUN: line then do substitution on the whole line
@@ -124,7 +132,7 @@ proc RunLLVMTests { test_source_files } {
       # if its an PR line, save the problem report number
       } elseif {[regexp {PR([0-9]+)} $line match prnum]} {
         if {$PRNUMS == ""} {
-          set PRNUMS $prnum
+          set PRNUMS "PR$prnum"
         } else {
           set PRNUMS "$PRNUMS,$prnum"
         }
@@ -157,7 +165,6 @@ proc RunLLVMTests { test_source_files } {
       set failed 0
       for { set i 0 } { $i < $numLines } { set i [ expr $i + 1 ] } {
         regsub ^.*RUN:(.*) $lines($i) \1 theLine
-        set theLine [subst $theLine ]
         set resultmsg [execOneLine $test $PRNUMS $outcome $i $theLine ]
         if { $resultmsg != "" } {
           if { $outcome == "XFAIL" } {
@@ -169,8 +176,10 @@ proc RunLLVMTests { test_source_files } {
           break
         }
       }
-      if { !$failed } {
-        if {$PRNUMS != ""} {
+      if { $failed } {
+        continue
+      } else {
+        if { $PRNUMS != "" } {
           set PRNUMS " for $PRNUMS"
         }
         if { $outcome == "XFAIL" } {
@@ -182,3 +191,44 @@ proc RunLLVMTests { test_source_files } {
     }
   }
 }
+
+# This procedure provides an interface to check the LLVMGCC_LANGS makefile
+# variable to see if llvm-gcc supports compilation of a particular language.
+proc llvm_gcc_supports { lang } {
+  global llvmgcc llvmgcc_langs
+  # validate the language choices and determine the name of the compiler
+  # component responsible for determining if the compiler has been built.
+  switch "$lang" {
+    ada     { set file gnat1 }
+    c       { set file cc1 }
+    c++     { set file cc1plus }
+    objc    { set file cc1 }
+    objc++  { set file cc1 }
+    fortran { set file fcc1 }
+    default { return 0 }
+  }
+  foreach supported_lang [split "$llvmgcc_langs" ,] {
+    if { "$lang" == "$supported_lang" } {
+      # FIXME: Knowing it is configured is not enough. We should do two more
+      # checks here. First, we need to run llvm-gcc -print-prog-name=$file to 
+      # get the path to the compiler. If we don't get a path, the language isn't
+      # properly configured or built. If we do get a path, we should check to 
+      # make sure that it is executable and perhaps even try executing it.
+      return 1;
+    }
+  }
+  return 0;
+}
+
+# This procedure provides an interface to check the TARGETS_TO_BUILD makefile
+# variable to see if a particular target has been configured to build. This
+# helps avoid running tests for targets that aren't available.
+proc llvm_supports_target { tgtName } {
+  global TARGETS_TO_BUILD
+  foreach target [split $TARGETS_TO_BUILD] {
+    if { [regexp $tgtName $target match] } {
+      return 1
+    }
+  }
+  return 0
+}