Merge GDB 7.5.1

gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp

 # This testcase is part of GDB, the GNU debugger.
 
 # Copyright 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
 # 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 test verifies that a local watchpoint isn't deleted when a
 # thread other than the thread the local watchpoint was set in stops
 # for a breakpoint.
 
 if {[skip_hw_watchpoint_multi_tests]} {
     return 0
 }
 
-set testfile "local-watch-wrong-thread"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 if {[gdb_compile_pthreads \
          "${srcdir}/${subdir}/${srcfile}" \
          "${binfile}" executable {debug} ] != "" } {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 if ![runto_main] then {
     fail "Can't run to main"
     return
 }
 
 set inc_line_1 [gdb_get_line_number "Loop increment 1"]
 set inc_line_2 [gdb_get_line_number "Loop increment 2"]
@@ skipping 64 matching lines @@
 # thread_function0 returns.
 gdb_test_no_output "set *myp=0" "let thread_function0 return"
 
 gdb_test "break ${srcfile}:${bkpt_here}" \
     "Breakpoint 6 at .*: file .*${srcfile}, line .*" \
     "breakpoint on thread_function0's caller"
 
 gdb_test "continue" \
     ".*Watchpoint.*deleted.*" \
     "local watchpoint automatically deleted"