The 'false.c' test must depend on llvm-g++.

Also, turn on Objective-C/C++ tests.
This should fix http://llvm.org/bugs/show_bug.cgi?id=3499.

llvm-svn: 64084

2 files changed, 26 insertions, 11 deletions

diff --git a/llvm/test/LLVMC/dg.exp b/llvm/test/LLVMC/dg.exp
new file mode 100644
index 00000000000..75ae326617e
--- /dev/null
+++ b/llvm/test/LLVMC/dg.exp
@@ -0,0 +1,26 @@
+load_lib llvm.exp
+
+set special_file "$srcdir/$subdir/false.c"
+
+if [ llvm_gcc_supports c ] then {
+    # tcl seems to lack 'filter' which would've made this easier...
+    set temp [glob -nocomplain $srcdir/$subdir/*.{c}]
+    set c_files [list]
+    foreach f $temp { if {$f != $special_file} {lappend c_files $f}}
+
+    RunLLVMTests [lsort $c_files]
+}
+
+if [ llvm_gcc_supports c++ ] then {
+    RunLLVMTests [lsort [concat [glob -nocomplain $srcdir/$subdir/*.{cpp}] $special_file]]
+}
+
+if [ llvm_gcc_supports objc ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
+}
+
+if [ llvm_gcc_supports obj-c++ ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
+}
+
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]
diff --git a/llvm/test/LLVMC/llvmc.exp b/llvm/test/LLVMC/llvmc.exp
deleted file mode 100644
index 8354097ed8e..00000000000
--- a/llvm/test/LLVMC/llvmc.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-load_lib llvm.exp
-
-if [ llvm_gcc_supports c ] then {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{c}]]
-}
-
-if [ llvm_gcc_supports c++ ] then {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{cpp}]]
-}
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]