Merge GDB 7.5.1

gdb/testsuite/gdb.objc/basicclass.exp

 # Copyright 2003-2004, 2006-2012 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 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, 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
 # which libraries to link in. Most of the time it uses pthread
 #
 if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
   return -1
 }
 
 #
@@ skipping 35 matching lines @@
         }
         timeout {
             fail "can't show language (timeout)"
             return
         }
     }
 }
 
 proc do_objc_tests {} {
     global subdir
-    global objdir
     global srcdir
     global binfile
     global gdb_prompt
 
 
     # Start with a fresh gdb.
 
     gdb_exit
     gdb_start
     gdb_reinitialize_dir $srcdir/$subdir
@@ skipping 54 matching lines @@
 #
 gdb_test "print object" \
     "\\$\[0-9\] = .*0x0" \
     " print an ivar of self"
 
 gdb_test "print self" \
     "\\$\[0-9\] = \\(.*BasicClass \\*\\) 0x\[0-9a-f\]+" \
     " 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"
 
 #
 # Break in a category
 #
 gdb_test "break hiddenMethod" \
     "Breakpoint.*at.* file .*$srcfile, line.61." \
     "breakpoint in category method"
 
 
@@ skipping 20 matching lines @@
 #
 gdb_test "print-object object" \
     "BasicClass gdb test object" \
     "Use of the print-object command"
 
 gdb_test "po self" \
     "BasicClass gdb test object" \
     "Use of the po (print-object) command"