Merge GDB 7.5.1

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

 # Copyright 1999-2001, 2003, 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
@@ skipping 13 matching lines @@
 #
 
 load_lib mi-support.exp
 set MIFLAGS "-i=mi2"
 
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-set testfile "until"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
+standard_testfile until.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-until.exp
      return -1
 }
 
 mi_delete_breakpoints
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 proc test_running_to_foo {} {
@@ skipping 28 matching lines @@
     # This is supposed to NOT stop at line 25. It stops right after foo is over.
     mi_execute_to "exec-until until.c:25" "location-reached" "main" "" ".*until.c" "(23|24)" ""\
         "until after current function"
 }
 
 test_running_to_foo
 test_until
 
 mi_gdb_exit
 return 0