Merge GDB 7.5.1

gdb/testsuite/gdb.threads/watchthreads.exp

 # This testcase is part of GDB, the GNU debugger.
 
 # 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/>.
 
 # Check that GDB can support multiple watchpoints across threads.
 
-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_multi_tests]} {
     return 0
 }
 
 proc target_no_stopped_data { } {
     return [istarget s390*-*-*]
 }
 
-set testfile "watchthreads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
+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}
 
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
@@ skipping 139 matching lines @@
     # may have more than 30 hits total.
     set result [expr $args_0 + $args_1 >= 30]
 } else {
     set result [expr $args_0 + $args_1 == 30]
 }
 if { $result } {
   pass $message 
 } else {
   fail $message 
 }