Merge GDB 7.5.1

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

 # Copyright (C) 2003, 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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Daniel Jacobowitz <drow@mvista.com>.
 #
 # It tests that the correct thread is single-stepped.  Prior to the
 # introduction of vCont, we didn't pass enough information to remote
 # multi-threaded stubs to reliably get this correct; gdbserver defaulted
 # to the first thread.
 
 # TODO: we should also test explicitly changing threads with the "thread"
 # command.
 
-if $tracelevel then {
-        strace $tracelevel
-}
+standard_testfile
 
-set testfile "switch-threads"
-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_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 runto_main
 
 gdb_breakpoint thread_func
 gdb_continue_to_breakpoint "continue to thread_func"
 gdb_test "next" ".*foo \\(\\);"