+# This procedure executes one line of a test case's execution script.
proc execOneLine { test PRS outcome lineno line } {
set status 0
set resultmsg ""
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 {
}
return $resultmsg
}
+# This procedure 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
+ global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
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 ]
regsub -all {%link} $new_line "$link" new_line
#replace %shlibext with shared library extension
regsub -all {%shlibext} $new_line "$shlibext" new_line
+ #replace %ocamlc with ocaml compiler command
+ regsub -all {%ocamlc} $new_line "$ocamlc" new_line
#replace %llvmlibsdir with configure library directory
regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line
#replace %p with path to source,
#replace %s with filename
regsub -all {%s} $new_line $test new_line
#replace %t with temp filenames
- regsub -all {%t} $new_line [file join Output $tmpFile] new_line
+ regsub -all {%t} $new_line $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]
}
file mkdir Output
+ cd Output
foreach test $test_source_files {
#Should figure out best way to set the timeout
set filename [file tail $test]
set outcome PASS
set tmpFile "$filename.tmp"
-
+
+ # Mark that it should not be XFAIL for this target.
+ set targetPASS 0
+
#set hasRunline bool to check if testcase has a runline
set numLines 0
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
- # and then save the line.
- } elseif {[regexp {RUN: *([^&]+)(&&)?} $line match oneline suffix]} {
+ # 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
# 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"
}
#split up target if more then 1 specified
foreach target [split $targets ,] {
if { [regexp {\*} $target match] } {
- set outcome XFAIL
+ if {$targetPASS != 1} {
+ set outcome XFAIL
+ }
} elseif { [regexp $target $target_triplet match] } {
- set outcome XFAIL
+ if {$targetPASS != 1} {
+ set outcome XFAIL
+ }
} elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2] } {
if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } {
- set outcome XFAIL
+ if {$targetPASS != 1} {
+ set outcome XFAIL
+ }
+ }
+ }
+ }
+ } elseif {[regexp {XTARGET:[ *](.+)} $line match targets]} {
+ set targets
+
+ #split up target if more then 1 specified
+ foreach target [split $targets ,] {
+ if { [regexp {\*} $target match] } {
+ set targetPASS 1
+ set outcome PASS
+ } elseif { [regexp $target $target_triplet match] } {
+ set targetPASS 1
+ set outcome PASS
+ } elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2] } {
+ if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } {
+ set targetPASS 1
+ set outcome PASS
}
}
}
}
}
}
+
+# 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
+}
projects / oota-llvm.git / blobdiff