Merge GDB 7.5.1

gdb/testsuite/gdb.reverse/watch-precsave.exp

Index: gdb/testsuite/gdb.reverse/watch-precsave.exp
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 054b7c2074cbd577a748517a74bd4f0ccee32d24..9c2ec495d781d8122cce000b3cba801d72ffe8f2 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -22,9 +22,8 @@ if ![supports_process_record] {
     return
 }
 
-set testfile "watch-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile watch-reverse.c
+set precsave [standard_output_file watch.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
@@ -44,14 +43,14 @@ gdb_test "break $end_location" \
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save watch.precsave" \
-    "Saved core file watch.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 watch.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload core file"