Test if the compiler supports Ada, and enable Ada tests if so. While I was

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

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index c5d4ffe9bfe6ff59d4d322cfd41e01ffc64b02e1..e4a52a0c1cbfd01ebb7c1d55d9843447c6dc7af2 100644 (file)
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -8,26 +8,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 {
       }
@@ -40,10 +40,14 @@ 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]
+
+  # Substitute all Tcl variables.
+  set new_line [subst $line ]
 
-  set new_line $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
@@ -66,11 +70,13 @@ 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
 }
 
-proc llvm-runtest { programs } {
-  global srcroot objroot srcdir objdir subdir target_triplet
+proc RunLLVMTests { test_source_files } {
+  global srcroot objroot srcdir objdir subdir target_triplet llvmgcc_version
   set timeout 60
 
   set path [file join $objdir $subdir]
@@ -85,7 +91,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
     
@@ -106,8 +112,8 @@ proc llvm-runtest { programs } {
       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
@@ -122,7 +128,7 @@ proc llvm-runtest { programs } {
       # 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"
         }
@@ -155,7 +161,6 @@ proc llvm-runtest { programs } {
       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" } {
@@ -167,8 +172,10 @@ proc llvm-runtest { programs } {
           break
         }
       }
-      if { !$failed } {
-        if {$PRNUMS != ""} {
+      if { $failed } {
+        continue
+      } else {
+        if { $PRNUMS != "" } {
           set PRNUMS " for $PRNUMS"
         }
         if { $outcome == "XFAIL" } {
@@ -180,3 +187,34 @@ proc llvm-runtest { programs } {
     }
   }
 }
+
+proc llvm_gcc_supports_objc { } {
+    global llvmgcc 
+    catch { set file_h [ open "/tmp/llvm_obj_check.m" w] }
+    set R [ catch { exec $llvmgcc -c "/tmp/llvm_obj_check.m"  -o /dev/null >& /tmp/llvm_obj_check.out } ]
+    set RESULT [ file size "/tmp/llvm_obj_check.out" ]
+    catch { file delete "/tmp/llvm_obj_check.m" }
+    catch { file delete "/tmp/llvm_obj_check.out" }
+    if { $RESULT == 0 } {
+        return 1
+    } else {
+        return 0
+    }
+}
+
+proc llvm_gcc_supports_ada { } {
+    global llvmgcc 
+    catch { set file_h [ open "/tmp/llvm_ada_check.adb" w] }
+    catch { puts $file_h "procedure llvm_ada_check is begin null; end;" }
+    catch { close $file_h }
+    set R [ catch { exec $llvmgcc -c -gnats "/tmp/llvm_ada_check.adb" >& /tmp/llvm_ada_check.out } ]
+    set RESULT [ file size "/tmp/llvm_ada_check.out" ]
+    catch { file delete "/tmp/llvm_ada_check.adb" }
+    catch { file delete "/tmp/llvm_ada_check.out" }
+    if { $RESULT == 0 } {
+        return 1
+    } else {
+        return 0
+    }
+}
+