diff options
author | Duncan Sands <baldrick@free.fr> | 2008-10-06 10:31:21 +0000 |
---|---|---|
committer | Duncan Sands <baldrick@free.fr> | 2008-10-06 10:31:21 +0000 |
commit | 96f945267c986ddedf3ec1af0f131841b056bc25 (patch) | |
tree | e16e94d11389ecee7babaae372d323e569d54efc | |
parent | edb05dfe4815682b91280a9f4b28c3e47da5b141 (diff) | |
download | external_llvm-96f945267c986ddedf3ec1af0f131841b056bc25.zip external_llvm-96f945267c986ddedf3ec1af0f131841b056bc25.tar.gz external_llvm-96f945267c986ddedf3ec1af0f131841b056bc25.tar.bz2 |
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
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | test/FrontendObjC++/dg.exp | 2 | ||||
-rw-r--r-- | test/lib/llvm.exp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 15fb0bb..41c3db2 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 8c7cbfd..3d7588d 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 } } |