Merge GDB 7.5.1

gdb/testsuite/gdb.threads/switch-threads.exp

Index: gdb/testsuite/gdb.threads/switch-threads.exp
diff --git a/gdb/testsuite/gdb.threads/switch-threads.exp b/gdb/testsuite/gdb.threads/switch-threads.exp
index 7a0e2616959210acaebe6a744941efcbdcd8f05c..c0ccb5825e7b14476fa7c84d090b157cf10a2121 100644
--- a/gdb/testsuite/gdb.threads/switch-threads.exp
+++ b/gdb/testsuite/gdb.threads/switch-threads.exp
@@ -23,22 +23,13 @@
 # TODO: we should also test explicitly changing threads with the "thread"
 # command.
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "switch-threads"
-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