Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi2-return.exp

 # Copyright 1999-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 12 matching lines @@
 #
 
 load_lib mi-support.exp
 set MIFLAGS "-i=mi2"
 
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-return
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
+standard_testfile basics.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-return.exp
      return -1
 }
 
 mi_delete_breakpoints
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 
@@ skipping 11 matching lines @@
 mi_runto callee4
 
 mi_gdb_test "205-break-delete" \
         "205\\^done.*" \
         "delete all breakpoints"
 
 test_return_simple
 
 mi_gdb_exit
 return 0