Merge GDB 7.5.1

gdb/testsuite/gdb.reverse/consecutive-precsave.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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file is part of the GDB testsuite.  It tests stepping over
 # consecutive instructions in a process record logfile.
 
 # This test suitable only for process record-replay
 if ![supports_process_record] {
     return
 }
 
-set testfile "consecutive-reverse"
-set srcfile ${testfile}.c
+standard_testfile consecutive-reverse.c
+set precsave [standard_output_file consecutive.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
 }
 
 runto main
 
 if [supports_process_record] {
     # Activate process record/replay
     gdb_test_no_output "record" "Turn on process record"
 }
 
 set end_location  [gdb_get_line_number "end of main"  ]
 gdb_test "break $end_location" \
     "Breakpoint $decimal at .*/$srcfile, line $end_location\." \
     "BP at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save consecutive.precsave" \
-    "Saved core file consecutive.precsave with execution log\."  \
+gdb_test "record save $precsave" \
+    "Saved core file $precsave with execution log\."  \
     "save process recfile"
 
 gdb_test "kill" "" "Kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
-gdb_test "record restore consecutive.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload precord save file"
 
 gdb_breakpoint foo
 gdb_test "continue" "Breakpoint $decimal, foo .*" \
         "continue to breakpoint in foo"
 
 set foo1_addr 0
 set foo2_addr 0
 set stop_addr 0
@@ skipping 45 matching lines @@
         } else {
             fail "$test_msg (wrong address)"
         }
     }
     -re "Breakpoint $decimal, foo.*$gdb_prompt $" {
         gdb_test "print \$pc == $foo1_addr" \
             "$decimal = 1" \
             "$test_msg"
     }
 }