Merge GDB 7.5.1

gdb/testsuite/gdb.threads/bp_in_thread.exp

Index: gdb/testsuite/gdb.threads/bp_in_thread.exp
diff --git a/gdb/testsuite/gdb.threads/bp_in_thread.exp b/gdb/testsuite/gdb.threads/bp_in_thread.exp
index ef8cc3f7ad4c6f3cd55e480c4b2a00831eb587a0..7b6182ca6fa422cdd673d485fc8f8e167d17cf88 100644
--- a/gdb/testsuite/gdb.threads/bp_in_thread.exp
+++ b/gdb/testsuite/gdb.threads/bp_in_thread.exp
@@ -18,22 +18,14 @@
 # GDB reported a SIGTRAP signal in a random thread when hitting
 # a breakpoint.
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "bp_in_thread"
-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
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart $binfile
+
 runto_main
 
 gdb_test "break noreturn" \