Changes in directory llvm/test/lib:
llvm.exp updated: 1.20 -> 1.21
---
Log message:
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.
---
Diffs of the changes: (+31 -28)
llvm.exp | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
Index: llvm/test/lib/llvm.exp
diff -u llvm/test/lib/llvm.exp:1.20 llvm/test/lib/llvm.exp:1.21
--- llvm/test/lib/llvm.exp:1.20 Sat Apr 21 15:40:17 2007
+++ llvm/test/lib/llvm.exp Sat Apr 21 16:45:51 2007
@@ -1,3 +1,4 @@
+# This procedure executes one line of a test case's execution script.
proc execOneLine { test PRS outcome lineno line } {
set status 0
set resultmsg ""
@@ -38,6 +39,8 @@
return $resultmsg
}
+# This prcoedure 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
@@ -75,6 +78,7 @@
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 llvmgcc_version
set timeout 60
@@ -188,36 +192,35 @@
}
}
-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
- }
+# 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 }
+ }
+ if { [ regexp $lang $llvmgcc_langs match ] } {
+ # 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] {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
