Merge GDB 7.5.1

gdb/testsuite/gdb.mi/gdb669.exp

 # Copyright 2002-2004, 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 10 matching lines @@
 set MIFLAGS "-i=mi"
 
 gdb_exit
 if {[mi_gdb_start]} {
     continue
 }
 
 #
 # Start here
 #
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/gdb669-$testfile"
+standard_testfile pthreads.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }
 
 mi_run_to_main
 check_mi_and_console_threads "at main"
 
 for {set i 0} {$i < 4} {incr i} {
   mi_next "next, try $i"
   check_mi_and_console_threads "try $i"
 }
 
 mi_gdb_exit