Merge GDB 7.5.1

gdb/testsuite/gdb.threads/thread-specific.exp

 # Copyright 2004, 2007-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 Daniel Jacobowitz <drow@mvista.com>.
 # It tests that the correct breakpoint is reported when we hit a
 # thread-specific breakpoint inserted for several threads.
 
-if $tracelevel then {
-        strace $tracelevel
-}
 
+standard_testfile
 
-set testfile "thread-specific"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
     return -1
 }
 
 # Return a list of the valid thread IDs, with the initial thread first.
 proc get_thread_list { } {
   global gdb_prompt
   global expect_out
 
   set thr_list ""
 
@@ skipping 20 matching lines @@
         pass "get threads list"
       } else {
         fail "get threads list (no threads)"
       }
     }
   }
 
   return $thr_list
 }
 
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 gdb_test_no_output "set print sevenbit-strings"
 gdb_test_no_output "set width 0"
 
 gdb_test {print $_thread} ".* = 0" "thread var when not running"
 
 runto_main
 
 gdb_breakpoint [gdb_get_line_number "thread-specific.exp: last thread start"]
 gdb_continue_to_breakpoint "all threads started"
@@ skipping 33 matching lines @@
 gdb_test_multiple "info breakpoint $this_breakpoint" "info on bp" {
     -re ".*stop only in thread (\[0-9\]*).*$gdb_prompt $" {
         set this_thread $expect_out(1,string)
         pass "found breakpoint for thread number"
     }
 }
 
 gdb_test {print $_thread} ".* = $this_thread" "thread var at break"
 
 return 0