-proc execOneLine { test outcome lineno line } {
+proc execOneLine { test PRS outcome lineno line } {
set status 0
set resultmsg ""
set retval [ catch { eval exec -keepnewline -- $line } errmsg ]
if { $retval != 0 } {
set code [lindex $::errorCode 0]
set lineno [expr $lineno + 1]
- set errmsg " at RUN: line $lineno\n$::errorInfo"
+ if { $PRS != ""} {
+ set PRS " for $PRS"
+ }
+ 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 {
}
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
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]
file mkdir Output
- foreach test $programs {
+ foreach test $test_source_files {
#Should figure out best way to set the timeout
#set timeout 40
# Open the test file and start reading lines
set testFileId [ open $test r]
set runline ""
+ set PRNUMS ""
foreach line [split [read $testFileId] \n] {
- #see if this is our run line
+ # if its the END. line then stop parsing (optimization for big files)
if {[regexp {END.[ *]$} $line match endofscript]} {
break
- } 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
+ # and then save the line.
} elseif {[regexp {RUN: *([^&]+)(&&)?} $line match oneline suffix]} {
set runline "$runline$oneline"
set runline [ substitute $runline $test $tmpFile ]
set lines($numLines) $runline
set numLines [expr $numLines + 1]
set runline ""
+
+ # if its an PR line, save the problem report number
+ } elseif {[regexp {PR([0-9]+)} $line match prnum]} {
+ if {$PRNUMS == ""} {
+ set PRNUMS "PR$prnum"
+ } else {
+ set PRNUMS "$PRNUMS,$prnum"
+ }
+ # if its an XFAIL line, see if we should be XFAILing or not.
} elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {
set targets
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 $outcome $i $theLine ]
+ set resultmsg [execOneLine $test $PRNUMS $outcome $i $theLine ]
if { $resultmsg != "" } {
if { $outcome == "XFAIL" } {
xfail "$resultmsg"
break
}
}
- if { !$failed } {
+ if { $failed } {
+ continue
+ } else {
+ if { $PRNUMS != "" } {
+ set PRNUMS " for $PRNUMS"
+ }
if { $outcome == "XFAIL" } {
- xpass "$test"
+ xpass "$test$PRNUMS"
} else {
- pass "$resultmsg"
+ pass "$test$PRNUMS"
}
}
}
}
}
+
+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
+ }
+}
+
projects / oota-llvm.git / blobdiff