Merge GDB 7.5.1

gdb/testsuite/gdb.threads/watchthreads2.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/>.
 
 # Check that watchpoints get propagated to all existing threads when the
 # watchpoint is created.
 
 set NR_THREADS 4
 set X_INCR_COUNT 10
 
-if $tracelevel {
-    strace $tracelevel
-}
-
 
 # This test verifies that a watchpoint is detected in the proper thread
 # so the test is only meaningful on a system with hardware watchpoints.
 if {[skip_hw_watchpoint_tests]} {
     return 0
 }
 
-set testfile "watchthreads2"
-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 -DX_INCR_COUNT=$X_INCR_COUNT"]] != "" } {
+standard_testfile
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS -DX_INCR_COUNT=$X_INCR_COUNT"]] != "" } {
     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" ""
 
 #
 # Run to `main' where we begin our tests.
 #
 
 if ![runto_main] then {
     gdb_suppress_tests
 }
@@ skipping 72 matching lines @@
     if { $test_flag == 0 } {
         set done 1
     }
 }
 
 if { $i == $limit } {
     pass "all threads incremented x"
 } else {
     kfail "gdb/10116" "gdb can drop watchpoints in multithreaded app"
 }