From: Duncan Sands <baldrick@free.fr>
Date: Mon, 6 Oct 2008 10:31:21 +0000 (+0000)
Subject: Actually run Obj-C++ tests if llvm-gcc supports.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=96f945267c986ddedf3ec1af0f131841b056bc25;p=oota-llvm.git

Actually run Obj-C++ tests if llvm-gcc supports.
Before there were two problems: (1) configure
turned "obj-c++" into "obj" in the langs line;
(2) the dejagnu library called it objc++ not
obj-c++.
Now the problem is that some of these tests don't
pass!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57167 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/configure b/configure
index 8520c899089..e4e155af41a 100755
--- a/configure
+++ b/configure
@@ -34242,7 +34242,7 @@ echo $ECHO_N "checking llvm-gcc component support... $ECHO_C" >&6; }
 
   LLVMGCC_MAJVERS=$llvmgccmajvers
 
-  llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'`
+  llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`
   LLVMGCC_LANGS=$llvmgcclangs
 
   { echo "$as_me:$LINENO: result: ok" >&5
diff --git a/test/FrontendObjC++/dg.exp b/test/FrontendObjC++/dg.exp
index 15fb0bb4843..41c3db2af09 100644
--- a/test/FrontendObjC++/dg.exp
+++ b/test/FrontendObjC++/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
-if [ llvm_gcc_supports objc++ ] then {
+if [ llvm_gcc_supports obj-c++ ] then {
     RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
 }
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index 8c7cbfd214e..3d7588dd6e2 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -237,7 +237,7 @@ proc llvm_gcc_supports { lang } {
     c       { set file cc1 }
     c++     { set file cc1plus }
     objc    { set file cc1obj }
-    objc++  { set file cc1objplus }
+    obj-c++ { set file cc1objplus }
     fortran { set file f951 }
     default { return 0 }
   }