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

diff --git a/test/FrontendAda/dg.exp b/test/FrontendAda/dg.exp
index 8d2f1b0..2307c3f 100644 (file)
--- a/test/FrontendAda/dg.exp
+++ b/test/FrontendAda/dg.exp
@@ -1,6 +1,6 @@
 load_lib llvm.exp
 
-if [ llvm_gcc_supports_ada ] then {
+if [ llvm_gcc_supports ada ] then {
     RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{adb,ads}]]
 }
 

diff --git a/test/FrontendObjC/dg.exp b/test/FrontendObjC/dg.exp
index fddbf7f..19f41a1 100644 (file)
--- a/test/FrontendObjC/dg.exp
+++ b/test/FrontendObjC/dg.exp
@@ -1,6 +1,6 @@
 load_lib llvm.exp
 
-if [ llvm_gcc_supports_objc ] then {
+if [ llvm_gcc_supports objc ] then {
     RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
 }
 

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index b2cb62d..3ed44d7 100644 (file)
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -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 @@ proc execOneLine { test PRS outcome lineno line } {
   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 @@ proc substitute { line test tmpFile } {
   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 RunLLVMTests { test_source_files } {
   }
 }
 
-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] {