Merge GDB 7.5.1

gdb/testsuite/gdb.threads/watchthreads.exp

Index: gdb/testsuite/gdb.threads/watchthreads.exp
diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index d9fc87c2abe319e5fb679fdb7bfc55bc3c0fede3..b74b291661aa2b8dc5c043d79a3c32fc900a8382 100644
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -17,10 +17,6 @@
 
 # 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.
@@ -32,10 +28,8 @@ 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
 }