* gdb.reverse/break-precsave.exp: Use standard_output_file.

	* gdb.reverse/consecutive-precsave.exp: Use standard_output_file.
	* gdb.reverse/finish-precsave.exp: Use standard_output_file.
	* gdb.reverse/i386-precsave.exp: Use standard_output_file.
	* gdb.reverse/machinestate-precsave.exp: Use standard_output_file.
	* gdb.reverse/sigall-precsave.exp: Use standard_output_file.
	* gdb.reverse/solib-precsave.exp: Use standard_output_file.
	* gdb.reverse/step-precsave.exp: Use standard_output_file.
	* gdb.reverse/until-precsave.exp: Use standard_output_file.
	* gdb.reverse/watch-precsave.exp: Use standard_output_file.

10 files changed, 40 insertions, 30 deletions

diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp
index e98be980cc8..af0f769b304 100644
--- a/gdb/testsuite/gdb.reverse/break-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/break-precsave.exp
@@ -22,6 +22,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile break-reverse.c
+set precsave [standard_output_file break.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
@@ -45,14 +46,14 @@ gdb_test "break $end_location" \
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save break.precsave" \
-    "Saved core file break.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 break.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload precord save file"
 
diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index 12e71e77854..b782c3665cf 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -22,6 +22,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile consecutive-reverse.c
+set precsave [standard_output_file consecutive.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
@@ -41,14 +42,14 @@ gdb_test "break $end_location" \
 
 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"
 
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index a24486ee837..775c68a02ef 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -21,6 +21,7 @@ if ![supports_reverse] {
 }
 
 standard_testfile finish-reverse.c
+set precsave [standard_output_file finish.precsave]
 
 if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
     return -1
@@ -42,14 +43,14 @@ gdb_test "break $breakloc" \
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save finish.precsave" \
-    "Saved core file finish.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 finish.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload precord save file"
 
diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp
index d1fcd8b2091..962b374ec1d 100644
--- a/gdb/testsuite/gdb.reverse/i386-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp
@@ -31,6 +31,7 @@ if ![istarget "i?86-*linux*"] then {
 }
 
 standard_testfile i386-reverse.c
+set precsave [standard_output_file i386.precsave]
 
 # some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags]
@@ -59,14 +60,14 @@ gdb_test "break $end_of_main" \
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save i386.precsave" \
-    "Saved core file i386.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 i386.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload precord save file"
 
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index 5f7745a7e5a..ad6053b9442 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -41,6 +41,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile machinestate.c ms1.c
+set precsave [standard_output_file machinestate.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile \
 	  [list $srcfile $srcfile2]] } {
@@ -67,14 +68,14 @@ gdb_test "break $endmain" \
 
 gdb_test "continue" "Breakpoint .* end main .*" "run to end of main"
 
-gdb_test "record save machinestate.precsave" \
-    "Saved core file machinestate.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 machinestate.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload prec save file"
 
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index 6c717d81a3e..465e3ccb82b 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -28,6 +28,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 
 standard_testfile sigall-reverse.c
+set precsave [standard_output_file sigall.precsave]
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     return -1
@@ -183,14 +184,14 @@ gdb_test "handle all nostop noprint"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save sigall.precsave" \
-    "Saved core file sigall.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 sigall.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload precord save file"
 
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 7e60ebdc495..85384c374fe 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -22,6 +22,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile solib-reverse.c
+set precsave [standard_output_file solib.precsave]
 set libfile  "shr2"
 set libsrc   ${libfile}.c
 set library  [standard_output_file ${libfile}.sl]
@@ -74,14 +75,14 @@ gdb_test "break $end_of_main" \
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save solib.precsave" \
-    "Saved core file solib.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 solib.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload core file"
 
diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp
index e93bea4cea8..f0f18321b23 100644
--- a/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -26,6 +26,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile step-reverse.c
+set precsave [standard_output_file step.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
@@ -45,14 +46,14 @@ gdb_test "break $end_of_main" \
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
 
-gdb_test "record save step.precsave" \
-    "Saved core file step.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 step.precsave" \
+gdb_test "record restore $precsave" \
     "Program terminated with signal .*" \
     "reload core file"
 
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index 5f471ffd795..3e271c2e795 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -22,6 +22,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile until-reverse.c ur1.c
+set precsave [standard_output_file until.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile \
 	  [list $srcfile $srcfile2]] } {
@@ -53,15 +54,15 @@ set timeout [expr $oldtimeout + 120]
 gdb_test "continue" "Breakpoint .* set breakpoint 10a here .*" "run to end of main"
 
 # So can this, against gdbserver, for example.
-gdb_test "record save until.precsave" \
-    "Saved core file until.precsave with execution log\."  \
+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"
 
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 441a25146b3..9c2ec495d78 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -23,6 +23,7 @@ if ![supports_process_record] {
 }
 
 standard_testfile watch-reverse.c
+set precsave [standard_output_file watch.precsave]
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
@@ -42,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"