Replace llvm_gcc_supports_ada and llvm_gcc_supports_objc with just a single

llvm_gcc_supports function that takes the language as an argument. Base that
function on the new LLVMGCC_LANGS configured variable so that we don't have
to execute feature checks during the test run.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36322 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2007-04-21 21:45:51 +00:00
parent 51162baae1
commit 12d81f3ff4
3 changed files with 33 additions and 30 deletions

View File

@ -1,6 +1,6 @@
load_lib llvm.exp load_lib llvm.exp
if [ llvm_gcc_supports_ada ] then { if [ llvm_gcc_supports ada ] then {
RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{adb,ads}]] RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{adb,ads}]]
} }

View File

@ -1,6 +1,6 @@
load_lib llvm.exp load_lib llvm.exp
if [ llvm_gcc_supports_objc ] then { if [ llvm_gcc_supports objc ] then {
RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]] RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
} }

View File

@ -1,3 +1,4 @@
# This procedure executes one line of a test case's execution script.
proc execOneLine { test PRS outcome lineno line } { proc execOneLine { test PRS outcome lineno line } {
set status 0 set status 0
set resultmsg "" set resultmsg ""
@ -38,6 +39,8 @@ proc execOneLine { test PRS outcome lineno line } {
return $resultmsg return $resultmsg
} }
# This prcoedure performs variable substitutions on the RUN: lines of a test
# cases.
proc substitute { line test tmpFile } { proc substitute { line test tmpFile } {
global srcroot objroot srcdir objdir subdir target_triplet prcontext global srcroot objroot srcdir objdir subdir target_triplet prcontext
global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers
@ -75,6 +78,7 @@ proc substitute { line test tmpFile } {
return $new_line return $new_line
} }
# This procedure runs the set of tests for the test_source_files array.
proc RunLLVMTests { test_source_files } { proc RunLLVMTests { test_source_files } {
global srcroot objroot srcdir objdir subdir target_triplet llvmgcc_version global srcroot objroot srcdir objdir subdir target_triplet llvmgcc_version
set timeout 60 set timeout 60
@ -188,36 +192,35 @@ proc RunLLVMTests { test_source_files } {
} }
} }
proc llvm_gcc_supports_objc { } { # This procedure provides an interface to check the LLVMGCC_LANGS makefile
global llvmgcc # variable to see if llvm-gcc supports compilation of a particular language.
catch { set file_h [ open "/tmp/llvm_obj_check.m" w] } proc llvm_gcc_supports { lang } {
set R [ catch { exec $llvmgcc -c "/tmp/llvm_obj_check.m" -o /dev/null >& /tmp/llvm_obj_check.out } ] global llvmgcc llvmgcc_langs
set RESULT [ file size "/tmp/llvm_obj_check.out" ] # validate the language choices and determine the name of the compiler
catch { file delete "/tmp/llvm_obj_check.m" } # component responsible for determining if the compiler has been built.
catch { file delete "/tmp/llvm_obj_check.out" } switch "$lang" {
if { $RESULT == 0 } { ada { set file gnat1 }
return 1 c { set file cc1 }
} else { c++ { set file cc1plus }
return 0 objc { set file cc1 }
} objc++ { set file cc1 }
} fortran { set file fcc1 }
default { return 0 }
proc llvm_gcc_supports_ada { } { }
global llvmgcc if { [ regexp $lang $llvmgcc_langs match ] } {
catch { set file_h [ open "/tmp/llvm_ada_check.adb" w] } # FIXME: Knowing it is configured is not enough. We should do two more
catch { puts $file_h "procedure llvm_ada_check is begin null; end;" } # checks here. First, we need to run llvm-gcc -print-prog-name=$file to get
catch { close $file_h } # the path to the compiler. If we don't get a path, the language isn't
set R [ catch { exec $llvmgcc -c -gnats "/tmp/llvm_ada_check.adb" >& /tmp/llvm_ada_check.out } ] # properly configured or built. If we do get a path, we should check to make
set RESULT [ file size "/tmp/llvm_ada_check.out" ] # sure that it is executable and perhaps even try executing it.
catch { file delete "/tmp/llvm_ada_check.adb" } return 1;
catch { file delete "/tmp/llvm_ada_check.out" } }
if { $RESULT == 0 } { return 0;
return 1
} else {
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 } { proc llvm_supports_target { tgtName } {
global TARGETS_TO_BUILD global TARGETS_TO_BUILD
foreach target [split $TARGETS_TO_BUILD] { foreach target [split $TARGETS_TO_BUILD] {