Merge GDB 7.5.1

gdb/testsuite/gdb.threads/killed.exp

 # Copyright 2002-2003, 2005, 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
@@ skipping 36 matching lines @@
 # $ kill %7
 # 
 # [7]+  Stopped                 $D6/gdb/gdb -nw killed
 # $ kill -9 %7
 # 
 # [7]+  Stopped                 $D6/gdb/gdb -nw killed
 # $ 
 # [7]+  Killed                  $D6/gdb/gdb -nw killed
 # $ 
 
-if $tracelevel then {
-        strace $tracelevel
-}
 
+standard_testfile
 
-set testfile "killed"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${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 {
   -re "$gdb_prompt $" {
     pass "run program to completion"
   }
   timeout {
     fail "run program to completion (timeout)"
   }
 }
 
 # Try to quit.
 send_gdb "quit\n"
 gdb_expect {
     -re "Quit anyway\\? \\(y or n\\) $" {
         send_gdb "y\n"
         exp_continue
     }
     eof {
         pass "GDB exits after multi-threaded program exits messily"
     }
     -re "Cannot find thread ${decimal}: generic error\[\r\n\]*$gdb_prompt $" {
         kfail "gdb/568" "GDB exits after multi-threaded program exits messily"
     }
     timeout {
         fail "GDB exits after multi-threaded program exits messily (timeout)"
     }
 }