set code [lindex $::errorCode 0]
set lineno [expr $lineno + 1]
if { $PRS != ""} {
- set PRS " for $PRS"
+ set PRS " for $PRS"
}
set errmsg " at line $lineno\nwhile running: $line\n$errmsg"
switch "$code" {
set resultmsg "$test$PRS\nFailed with posix($posixNum,$posixMsg)$errmsg"
}
NONE {
+ # Any other error such as stderr output of a program, or syntax error in
+ # the RUN line.
+ set resultmsg "$test$PRS\nFailed with unknown error (or has stderr output)$errmsg"
}
default {
+ set resultmsg "$test$PRS\nFailed with unknown error$errmsg"
}
}
- }
+ }
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 ocamlc
+ global srcroot objroot srcdir objdir subdir target_triplet
+ global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlopt
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
+ global llvmdsymutil valgrind grep gas bugpoint_topts
set path [file join $srcdir $subdir]
# 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 %% with _#MARKER#_ to make the replacement of %% more predictable
+ regsub -all {%%} $new_line {_#MARKER#_} new_line
+ #replace %llvmgcc_only with actual path to llvmgcc
+ regsub -all {%llvmgcc_only} $new_line "$llvmgcc" new_line
#replace %llvmgcc with actual path to llvmgcc
- regsub -all {%llvmgcc} $new_line "$llvmgcc -emit-llvm" new_line
+ regsub -all {%llvmgcc} $new_line "$llvmgcc -emit-llvm -w" 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
+ regsub -all {%llvmgxx} $new_line "$llvmgxx -emit-llvm -w" 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
regsub -all {%shlibext} $new_line "$shlibext" new_line
- #replace %ocamlc with ocaml compiler command
- regsub -all {%ocamlc} $new_line "$ocamlc" new_line
+ #replace %ocamlopt with ocaml compiler command
+ regsub -all {%ocamlopt} $new_line "$ocamlopt" new_line
+ #replace %llvmdsymutil with dsymutil command
+ regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line
#replace %llvmlibsdir with configure library directory
regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line
- #replace %p with path to source,
+ #replace %bugpoint_topts with actual bugpoint target options
+ regsub -all {%bugpoint_topts} $new_line "$bugpoint_topts" new_line
+ #replace %p with path to source,
regsub -all {%p} $new_line [file join $srcdir $subdir] new_line
#replace %s with filename
regsub -all {%s} $new_line $test new_line
#replace %t with temp filenames
regsub -all {%t} $new_line $tmpFile new_line
- #replace %% with %
- regsub -all {%%} $new_line % new_line
+ #replace %abs_tmp with absolute temp filenames
+ regsub -all {%abs_tmp} $new_line [file join [pwd] $tmpFile] new_line
+ #replace _#MARKER#_ with %
+ regsub -all {_#MARKER#_} $new_line % new_line
+
+ #replace grep with GNU grep
+ regsub -all { grep } $new_line " $grep " new_line
+ #replace as with GNU as
+ regsub -all {\| as } $new_line "| $gas " new_line
+
+ #valgind related stuff
+# regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line
+ regsub -all {llc } $new_line "$valgrind llc " new_line
+ regsub -all {lli } $new_line "$valgrind lli " new_line
+ regsub -all {llvm-ar } $new_line "$valgrind llvm-ar " new_line
+ regsub -all {llvm-as } $new_line "$valgrind llvm-as " new_line
+ regsub -all {llvm-bcanalyzer } $new_line "$valgrind llvm-bcanalyzer " new_line
+ regsub -all {llvm-dis } $new_line "$valgrind llvm-dis " new_line
+ regsub -all {llvm-extract } $new_line "$valgrind llvm-extract " new_line
+ regsub -all {llvm-ld } $new_line "$valgrind llvm-ld " new_line
+ regsub -all {llvm-link } $new_line "$valgrind llvm-link " new_line
+ regsub -all {llvm-nm } $new_line "$valgrind llvm-nm " new_line
+ regsub -all {llvm-prof } $new_line "$valgrind llvm-prof " new_line
+ regsub -all {llvm-ranlib } $new_line "$valgrind llvm-ranlib " new_line
+ regsub -all {([^a-zA-Z_-])opt } $new_line "\\1$valgrind opt " new_line
+ regsub -all {^opt } $new_line "$valgrind opt " new_line
+ regsub -all {tblgen } $new_line "$valgrind tblgen " new_line
+ regsub -all "not $valgrind " $new_line "$valgrind not " new_line
+
return $new_line
}
set timeout 60
set path [file join $objdir $subdir]
-
+
#Make Output Directory if it does not exist already
if { [file exists path] } {
cd $path
file mkdir $path
cd $path
}
-
+
file mkdir Output
cd Output
foreach test $test_source_files {
#Should figure out best way to set the timeout
#set timeout 40
-
+
set filename [file tail $test]
+ verbose "ABOUT TO RUN: $filename" 2
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
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
set runline "$runline$oneline "
# if its a terminating RUN: line then do substitution on the whole line
- # and then save the line.
+ # and then save the line.
} elseif {[regexp {RUN: *(.+)$} $line match oneline suffix]} {
set runline "$runline$oneline"
set runline [ substitute $runline $test $tmpFile ]
#split up target if more then 1 specified
foreach target [split $targets ,] {
- if { [regexp {\*} $target match] } {
+ if { $target == "*" } {
if {$targetPASS != 1} {
set outcome XFAIL
}
}
}
}
-
+
# Done reading the script
close $testFileId
-
-
+
+
if { $numLines == 0 } {
fail "$test: \nDoes not have a RUN line\n"
} else {
ada { set file gnat1 }
c { set file cc1 }
c++ { set file cc1plus }
- objc { set file cc1 }
- objc++ { set file cc1 }
- fortran { set file fcc1 }
+ objc { set file cc1obj }
+ obj-c++ { set file cc1objplus }
+ fortran { set file f951 }
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
+ # 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
+ # 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 BINDINGS_TO_BUILD makefile
+# variable to see if a particular binding has been configured to build.
+proc llvm_supports_binding { name } {
+ global llvm_bindings
+ foreach item [split $llvm_bindings] {
+ if { [regexp $name $item match] } {
+ return 1
+ }
+ }
+ return 0
+}