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 | bae7a517ccc643fb18dad79c30bf73afc3732d78 (patch) | |
tree | e78b52b840956e9e5c760b9e681e983211903e94 | |
parent | 2a1d8bace1f823c49ab9981b4939a62d44793daa (diff) | |
download | bcm5719-llvm-bae7a517ccc643fb18dad79c30bf73afc3732d78.tar.gz bcm5719-llvm-bae7a517ccc643fb18dad79c30bf73afc3732d78.zip |
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!
llvm-svn: 57167
-rwxr-xr-x | llvm/configure | 2 | ||||
-rw-r--r-- | llvm/test/FrontendObjC++/dg.exp | 2 | ||||
-rw-r--r-- | llvm/test/lib/llvm.exp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/llvm/configure b/llvm/configure index 8520c899089..e4e155af41a 100755 --- a/llvm/configure +++ b/llvm/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/llvm/test/FrontendObjC++/dg.exp b/llvm/test/FrontendObjC++/dg.exp index 15fb0bb4843..41c3db2af09 100644 --- a/llvm/test/FrontendObjC++/dg.exp +++ b/llvm/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/llvm/test/lib/llvm.exp b/llvm/test/lib/llvm.exp index 8c7cbfd214e..3d7588dd6e2 100644 --- a/llvm/test/lib/llvm.exp +++ b/llvm/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 } } |