Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi2-stepi.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-stepi
-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-stepi.exp
      return -1
 }
 
 proc test_stepi_nexti {} {
     global mi_gdb_prompt
     global hex fullname_syntax srcfile
 
     set line_main_head  [gdb_get_line_number "main ("]
     set line_main_body  [expr $line_main_head + 2]
@@ skipping 22 matching lines @@
     } else {
         fail "next-instruction at main 2 (line check)"
     }
 }
 
 mi_run_to_main
 test_stepi_nexti
 
 mi_gdb_exit
 return 0