Merge GDB 7.5.1

gdb/testsuite/gdb.threads/pending-step.exp

 # Copyright (C) 2009-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
@@ skipping 30 matching lines @@
 #    single-step, and all other threads to continue, including thread
 #    1.  Before resuming any thread, gdbserver notices that it
 #    remembers from step 4 a pending SIGTRAP to report for thread 1,
 #    so reports it now.
 #
 # 6) From GDB's perpective, this SIGTRAP can't represent a finished
 #    single-step, since thread 1 was not single-stepping (it was
 #    continued in step 5).  Neither does this SIGTRAP correspond to a
 #    breakpoint hit.  GDB reports to the user a spurious SIGTRAP.
 
-set testfile "pending-step"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_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
 }
 
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if ![runto_main] then {
     fail "Can't run to main"
     return 0
 }
 
 gdb_breakpoint [gdb_get_line_number "insert breakpoint here"]
 gdb_continue_to_breakpoint "continue to first breakpoint hit"
 
 set test "next in multiple threads with breakpoints"
@@ skipping 11 matching lines @@
     }
 
     if { $ok == 0 } {
         break
     }
 }
 
 if { $ok  } {
     pass "$test"
 }