[llvm-commits] [llvm] r57167 - in /llvm/trunk: configure test/FrontendObjC++/dg.exp test/lib/llvm.exp

[Duncan Sands]

Author: baldrick
Date: Mon Oct  6 05:31:21 2008
New Revision: 57167

URL: http://llvm.org/viewvc/llvm-project?rev=57167&view=rev
Log:
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!

Modified:
    llvm/trunk/configure
    llvm/trunk/test/FrontendObjC++/dg.exp
    llvm/trunk/test/lib/llvm.exp

Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=57167&r1=57166&r2=57167&view=diff

==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Mon Oct  6 05:31:21 2008
@@ -34242,7 +34242,7 @@
 
   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

Modified: llvm/trunk/test/FrontendObjC++/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendObjC%2B%2B/dg.exp?rev=57167&r1=57166&r2=57167&view=diff

==============================================================================
--- llvm/trunk/test/FrontendObjC++/dg.exp (original)
+++ llvm/trunk/test/FrontendObjC++/dg.exp Mon Oct  6 05:31:21 2008
@@ -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}]]
 }

Modified: llvm/trunk/test/lib/llvm.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=57167&r1=57166&r2=57167&view=diff

==============================================================================
--- llvm/trunk/test/lib/llvm.exp (original)
+++ llvm/trunk/test/lib/llvm.exp Mon Oct  6 05:31:21 2008
@@ -237,7 +237,7 @@
     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 }
   }