Merge GDB 7.5.1

gdb/testsuite/gdb.threads/hand-call-in-threads.exp

 # Copyright (C) 2004, 2007-2008, 2010-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/>.
 
 # Test making hand function calls in multiple threads.
 
 set NR_THREADS 4
 
-if $tracelevel then {
-        strace $tracelevel
-}
+standard_testfile
 
-set testfile "hand-call-in-threads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}" "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
     return -1
 }
 
 # Some targets can't do function calls, so don't even bother with this
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     setup_xfail "*-*-*" 2416
     fail "This target can not call functions"
     continue
 }
 
 proc get_dummy_frame_number { } {
     global gdb_prompt
 
     gdb_test_multiple "bt" "" {
         -re "#(\[0-9\]*) *<function called from gdb>.*$gdb_prompt $" {
             return $expect_out(1,string)
         }
         -re "$gdb_prompt $" {
             return ""
         }
         timeout {
             return ""
         }
     }
     return ""
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if { ![runto_main] } {
     fail "Can't run to main"
     return 0
 }
 
 gdb_test "break all_threads_running" \
          "Breakpoint 2 at .*: file .*${srcfile}, line .*" \
          "breakpoint on all_threads_running"
 
@@ skipping 79 matching lines @@
 # An alternative is to manually work around the issue by manually setting
 # the thread back to the first thread: the program is still at the
 # all_threads_running breakpoint, which wasn't the last thread to run,
 # and gdb doesn't know how to singlestep over reported breakpoints that
 # weren't in the last thread to run.
 #gdb_test "thread 1" ".*" "set thread to 1, prepare to resume"
 #
 #gdb_continue_to_end "hand-call-in-threads"
 
 return 0