Merge GDB 7.5.1

gdb/testsuite/gdb.threads/killed.exp

Index: gdb/testsuite/gdb.threads/killed.exp
diff --git a/gdb/testsuite/gdb.threads/killed.exp b/gdb/testsuite/gdb.threads/killed.exp
index c9c639703962826dd10f1cb95e316bffd296187c..2e22886a689cdb53f15c8e0d6971255490ded544 100644
--- a/gdb/testsuite/gdb.threads/killed.exp
+++ b/gdb/testsuite/gdb.threads/killed.exp
@@ -54,23 +54,15 @@
 # [7]+  Killed                  $D6/gdb/gdb -nw killed
 # $ 
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 
-set testfile "killed"
-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_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 gdb_run_cmd
 gdb_expect {