Fix more cases of improper test names

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.reverse / finish-precsave.exp

diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index 7ba7b88fde0ed5ab08a87387ae2b751344322014..a124c29a810e58376ff9aab6547d863e4c6da09f 100644 (file)
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -1,4 +1,4 @@
-# Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright 2008-2016 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
@@ -20,10 +20,10 @@ if ![supports_reverse] {
     return
 }
 
-set testfile "finish-reverse"
-set srcfile ${testfile}.c
+standard_testfile finish-reverse.c
+set precsave [standard_output_file finish.precsave]
 
-if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
+if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } {
     return -1
 }
 
@@ -31,36 +31,36 @@ runto main
 
 if [supports_process_record] {
     # Activate process record/replay
-    gdb_test_no_output "record" "Turn on process record"
+    gdb_test_no_output "record" "turn on process record"
 }
 
 # Run until end, then save execution log. 
 
 set breakloc [gdb_get_line_number "end of main" "$srcfile"]
 gdb_test "break $breakloc" \
-    "Breakpoint $decimal at .*/$srcfile, line $breakloc\." \
-    "BP at end of main"
+    "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
+    "breakpoint at end of main"
 
 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" \
+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" \
-    "Program terminated with signal .*" \
+gdb_test "record restore $precsave" \
+    "Restored records from core file .*" \
     "reload precord save file"
 
 # Test finish from void func
 
 set breakloc [gdb_get_line_number "VOID FUNC" "$srcfile"]
 gdb_test "break void_func" \
-    "Breakpoint $decimal at .*/$srcfile, line $breakloc\." \
+    "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
     "set breakpoint on void_func"
-gdb_continue_to_breakpoint "void_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "void_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "finish from void_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -77,9 +77,9 @@ gdb_test_multiple "finish" "$test_msg" {
 
 set breakloc [gdb_get_line_number "CHAR FUNC" "$srcfile"]
 gdb_test "break char_func" \
-    "Breakpoint $decimal at .*/$srcfile, line $breakloc\." \
+    "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
     "set breakpoint on char_func"
-gdb_continue_to_breakpoint "char_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "char_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "finish from char_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -98,7 +98,7 @@ set breakloc [gdb_get_line_number "SHORT FUNC" "$srcfile"]
 gdb_test "break short_func" \
     "Breakpoint $decimal at .* line $breakloc\." \
     "set breakpoint on short_func"
-gdb_continue_to_breakpoint "short_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "short_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "finish from short_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -117,7 +117,7 @@ set breakloc [gdb_get_line_number "INT FUNC" "$srcfile"]
 gdb_test "break int_func" \
     "Breakpoint $decimal at .* line $breakloc\." \
     "set breakpoint on int_func"
-gdb_continue_to_breakpoint "int_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "int_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "finish from int_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -136,7 +136,7 @@ set breakloc [gdb_get_line_number "LONG FUNC" "$srcfile"]
 gdb_test "break long_func" \
     "Breakpoint $decimal at .* line $breakloc\." \
     "set breakpoint on long_func"
-gdb_continue_to_breakpoint "long_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "finish from long_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -155,7 +155,7 @@ set breakloc [gdb_get_line_number "LONG LONG FUNC" "$srcfile"]
 gdb_test "break long_long_func" \
     "Breakpoint $decimal at .* line $breakloc\." \
     "set breakpoint on long_long_func"
-gdb_continue_to_breakpoint "long_long_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_long_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "finish from long_long_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -179,7 +179,7 @@ gdb_test_no_output "set exec-dir reverse" "set reverse execution"
 # Test reverse finish from long long func
 
 set breakloc [gdb_get_line_number "LONG LONG FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "long_long_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_long_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "reverse finish from long_long_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -191,7 +191,7 @@ gdb_test_multiple "finish" "$test_msg" {
 # Test reverse finish from long func
 
 set breakloc [gdb_get_line_number "LONG FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "long_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "reverse finish from long_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -203,7 +203,7 @@ gdb_test_multiple "finish" "$test_msg" {
 # Test reverse finish from int func
 
 set breakloc [gdb_get_line_number "INT FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "int_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "int_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "reverse finish from int_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -215,7 +215,7 @@ gdb_test_multiple "finish" "$test_msg" {
 # Test reverse finish from short func
 
 set breakloc [gdb_get_line_number "SHORT FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "short_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "short_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "reverse finish from short_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -227,7 +227,7 @@ gdb_test_multiple "finish" "$test_msg" {
 # Test reverse finish from char func
 
 set breakloc [gdb_get_line_number "CHAR FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "char_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "char_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "reverse finish from char_func"
 gdb_test_multiple "finish" "$test_msg" {
@@ -239,7 +239,7 @@ gdb_test_multiple "finish" "$test_msg" {
 # Test reverse finish from void func
 
 set breakloc [gdb_get_line_number "VOID FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "void_func" ".*/$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "void_func" ".*$srcfile:$breakloc.*"
 
 set test_msg "reverse finish from void_func"
 gdb_test_multiple "finish" "$test_msg" {