Merge GDB 7.5.1

gdb/testsuite/gdb.reverse/machinestate.exp

 # Copyright 2008-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 @@
 #   shared library variable
 #   heap variable (pointer)...
 #   overlay variables...
 #   Test forward replay
 #
 
 if ![supports_reverse] {
     return
 }
 
-set testfile "machinestate"
-set srcfile  ${testfile}.c
-set srcfile1 ms1.c
+standard_testfile .c ms1.c
 
-if { [prepare_for_testing $testfile.exp $testfile {machinestate.c ms1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile \
+          [list $srcfile $srcfile2]] } {
     return -1
 }
 
 set newline "\[\r\n\]+"
 
 set beginmain [gdb_get_line_number " begin main " $srcfile]
 set endmain   [gdb_get_line_number " end main "   $srcfile]
 
 # Test begins
 
@@ skipping 163 matching lines @@
 gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
 gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print aglobal" ".* = 0$newline"  "module global forward-breakpoint"
 gdb_test "reverse-step"  ".*hide.*" ""
 gdb_test "step"          ".*$newline$breakloc.*" ""
 gdb_test "print aglobal" ".* = 0$newline"  "module global forward step-to"
 gdb_test "step"          ".* module global post-change .*" ""
 gdb_test "print aglobal" ".* = 1$newline"  "module global step post-change"