Handle void * conversions in FreeBSD/x86 native code to fix C++ build.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.objc / basicclass.exp

diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp
index 208d89f4c9bc5c6cb30696f34efd66ea8dd225d5..d950645d0937500d762451be7081404c2bb1662e 100644 (file)
--- a/gdb/testsuite/gdb.objc/basicclass.exp
+++ b/gdb/testsuite/gdb.objc/basicclass.exp
@@ -1,28 +1,21 @@
-# Copyright 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2003-2016 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Adam Fedor (fedor@gnu.org)
 
-if $tracelevel then {
-       strace $tracelevel
-}
-
-set testfile "basicclass"
-set srcfile ${testfile}.m
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .m
 
 #
 # Objective-C program compilation isn't standard. We need to figure out
@@ -77,16 +70,11 @@ proc deduce_language_of_main {} {
 }
 
 proc do_objc_tests {} {
-    global prms_id
-    global bug_id
     global subdir
-    global objdir
     global srcdir
     global binfile
     global gdb_prompt
 
-    set prms_id 0
-    set bug_id 0
 
     # Start with a fresh gdb.
 
@@ -103,6 +91,11 @@ do_objc_tests
 #
 # Breakpoint tests
 #
+
+# Disable pending breakpoint query to avoid timeouts
+# if Obj-C symbols cannot be found
+gdb_test "set breakpoint pending off" "" "set breakpoint pending"
+
 gdb_test "break doIt" \
     "Breakpoint.*at.* file .*$srcfile, line.29.*" \
     "breakpoint method"
@@ -126,12 +119,7 @@ gdb_test continue \
 # Test resetting breakpoints when re-running program
 #
 gdb_run_cmd
-gdb_expect {
-    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:.*$gdb_prompt $"\
-                            { pass "resetting breakpoints when rerunning" }
-    -re ".*$gdb_prompt $"       { fail "resetting breakpoints when rerunning" }
-    timeout                 { fail "resetting breakpoints when rerunning" }
-}
+gdb_test "" "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:.*" "resetting breakpoints when r
 
 #
 # Continue until breakpoint (test re-setting breakpoint)
@@ -152,7 +140,7 @@ gdb_test "print self" \
     " print self"
 
 gdb_test "print \*self" \
-    "\\$\[0-9\] = \{{?isa = 0x\[0-9a-f\]+}?, object = 0x0\}" \
+    "\\$\[0-9\] = \{{?isa = 0x\[0-9a-f\]+( <.*>)?}?, object = 0x0\}" \
     " print contents of self"
 
 #