Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi-nonstop.exp

 # Copyright 2002-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 21 matching lines @@
         # If a resume fails, assume non-stop is broken or unsupported
         # for this target.  We have logged a FAIL or UNSUPPORTED; skip
         # the remaining tests to limit timeouts.
         return -code continue
     }
 }
 
 #
 # Start here
 #
-set testfile "non-stop"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile non-stop.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }
 
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load $binfile
 
 mi_gdb_test "-gdb-set non-stop 1" ".*"
 mi_gdb_test "-gdb-set target-async 1" ".*"
 mi_detect_async
@@ skipping 90 matching lines @@
         }
     }
 }
 
 # See that we can still poke other threads.
 mi_gdb_test "-stack-list-frames --thread 3" \
     "\\^done,stack=\\\[frame={level=\"0\",addr=\".*\",func=\"break_at_me\".*" \
     "stacktrace of stopped thread"
 
 mi_gdb_exit