Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.reverse/until-precsave.exp
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index ce62c07d0cfea9d152eb1f87b0b58c831abd3f63..3e271c2e7950ee6af6ae105559457076149ea645 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -21,17 +21,17 @@ if ![supports_process_record] {
     return
 }
 
-set testfile "until-reverse"
-set srcfile ${testfile}.c
-set srcfile1 ur1.c
+standard_testfile until-reverse.c ur1.c
+set precsave [standard_output_file until.precsave]
 
-if { [prepare_for_testing $testfile.exp $testfile {until-reverse.c ur1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile \
+	  [list $srcfile $srcfile2]] } {
     return -1
 }
 
 set bp_location1  [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location7  [gdb_get_line_number "set breakpoint 7 here"]
-set bp_location9  [gdb_get_line_number "set breakpoint 9 here" "$srcfile1"]
+set bp_location9  [gdb_get_line_number "set breakpoint 9 here" "$srcfile2"]
 set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
 set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
 set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
@@ -52,16 +52,17 @@ gdb_test "break $end_of_main" \
 set oldtimeout $timeout
 set timeout [expr $oldtimeout + 120]
 gdb_test "continue" "Breakpoint .* set breakpoint 10a here .*" "run to end of main"
-set timeout $oldtimeout
 
-gdb_test "record save until.precsave" \
-    "Saved core file until.precsave with execution log\."  \
+# So can this, against gdbserver, for example.
+gdb_test "record save $precsave" \
+    "Saved core file $precsave with execution log\."  \
     "save process recfile"
+set timeout $oldtimeout
 
 gdb_test "kill" "" "Kill process, prepare to debug log file" \
     "Kill the program being debugged\\? \\(y or n\\) " "y"
 
-gdb_test "record restore until.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload core file"
 
@@ -94,7 +95,7 @@ gdb_test "finish" \
 # Advance to a function called by main (marker2)
 #
 gdb_test "advance marker2" \
-    "marker2 .a=43.*$srcfile1:$bp_location9.*" \
+    "marker2 .a=43.*$srcfile2:$bp_location9.*" \
     "advance to marker2"
 
 # Now issue an until with another function, not called by the current
@@ -125,7 +126,7 @@ gdb_test_no_output "set exec-dir reverse" "set reverse execution"
 #
 
 gdb_test "advance marker2" \
-    "marker2 .a=43.*$srcfile1:$bp_location9.*" \
+    "marker2 .a=43.*$srcfile2:$bp_location9.*" \
     "reverse-advance to marker2"
 
 # Finish out to main scope (backward)