Merge GDB 7.5.1

gdb/testsuite/gdb.opt/inline-cmds.exp

Index: gdb/testsuite/gdb.opt/inline-cmds.exp
diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index 13aeeb81ae44f32e2563abee3106bb71cdbbc6e5..2a333e0be3708a28c4ed8b7cb7bffc94b1e3e728 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -13,30 +13,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "inline-cmds"
-set srcfile "${testfile}.c"
-set srcfile2 "inline-markers.c"
-set fullsrcfile "${srcdir}/${subdir}/${srcfile}"
-set fullsrcfile2 "${srcdir}/${subdir}/${srcfile2}"
-set sources [list ${fullsrcfile} ${fullsrcfile2}]
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile $sources ${binfile} \
-	   executable {debug optimize=-O2}] != "" } {
-    untested inline-cmds.exp
+standard_testfile .c inline-markers.c
+
+if {[prepare_for_testing $testfile.exp $testfile \
+	 [list $srcfile $srcfile2] {debug optimize=-O2}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 gdb_test_no_output "set listsize 1"
 
 runto_main
 
-get_compiler_info $binfile
+get_compiler_info
 get_debug_format
 if { [skip_inline_frame_tests] } {
     untested inline-cmds.exp