2014-10-03  Luis Machado  <lgustavo@codesourcery.com>

	gdb/testsuite/
	* gdb.guile/scm-breakpoint.exp: Do not assume any
	directory separators when matching source file paths.
	* gdb.python/py-breakpoint.exp: Likewise.
	* gdb.reverse/break-precsave.exp: Likewise.
	* gdb.reverse/break-reverse.exp: Likewise.
	* gdb.reverse/consecutive-precsave.exp: Likewise.
	* gdb.reverse/finish-precsave.exp: Likewise.
	* gdb.reverse/finish-reverse-bkpt.exp: Likewise.
	* gdb.reverse/finish-reverse.exp: Likewise.
	* gdb.reverse/i386-precsave.exp: Likewise.
	* gdb.reverse/i387-env-reverse.exp: Likewise.
	* gdb.reverse/i387-stack-reverse.exp: Likewise.
	* gdb.reverse/machinestate-precsave.exp: Likewise.
	* gdb.reverse/machinestate.exp: Likewise.
	* gdb.reverse/sigall-precsave.exp: Likewise.
	* gdb.reverse/solib-precsave.exp: Likewise.
	* gdb.reverse/step-precsave.exp: Likewise.
	* gdb.reverse/until-precsave.exp: Likewise.
	* gdb.reverse/watch-precsave.exp: Likewise.
	* gdb.reverse/watch-reverse.exp: Likewise.

diff --git a/gdb/testsuite/gdb.guile/scm-breakpoint.exp b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
index d181710..6a3938e 100644
--- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp
+++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
@@ -126,7 +126,7 @@ proc test_bkpt_deletion { } {
 	gdb_test "guile (print (length del-list))" \
 	    "= 3" "number of breakpoints before delete"
 	gdb_continue_to_breakpoint "Break at multiply." \
-	    ".*/$srcfile:$deltst_location.*"
+	    ".*$srcfile:$deltst_location.*"
 	gdb_scm_test_silent_cmd  "guile (delete-breakpoint! dp1)" \
 	    "delete breakpoint"
 	gdb_test "guile (print (breakpoint-number dp1))" \
@@ -136,7 +136,7 @@ proc test_bkpt_deletion { } {
 	    "get breakpoint list 5"
 	gdb_test "guile (print (length del-list))" \
 	    "= 2" "number of breakpoints after delete"
-	gdb_continue_to_breakpoint "Break at end." ".*/$srcfile:$end_location.*"
+	gdb_continue_to_breakpoint "Break at end." ".*$srcfile:$end_location.*"
     }
 }
 
@@ -372,7 +372,7 @@ proc test_bkpt_eval_funcs { } {
 	    "create also-eval-bp1 breakpoint"
 	gdb_scm_test_silent_cmd  "guile (define never-eval-bp1 (make-bp-also-eval \"$end_location\"))" \
 	    "create never-eval-bp1 breakpoint"
-	gdb_continue_to_breakpoint "Break at multiply." ".*/$srcfile:$bp_location2.*"
+	gdb_continue_to_breakpoint "Break at multiply." ".*$srcfile:$bp_location2.*"
 	gdb_test "print i" "3" "check inferior value matches guile accounting"
 	gdb_test "guile (print (bp-eval-inf-i eval-bp1))" \
 	    "= 3" "check guile accounting matches inferior"
@@ -414,7 +414,7 @@ proc test_bkpt_eval_funcs { } {
 	gdb_test "guile (print (bp-eval-count check-eval))" \
 	    "= 0" \
 	    "test that evaluate function has not been yet executed (ie count = 0)"
-	gdb_continue_to_breakpoint "Break at multiply." ".*/$srcfile:$bp_location2.*"
+	gdb_continue_to_breakpoint "Break at multiply." ".*$srcfile:$bp_location2.*"
 	gdb_test "guile (print (bp-eval-count check-eval))" \
 	    "= 1" \
 	    "test that evaluate function is run when location also has normal bp"
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index 911d586..be0fa34 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -133,7 +133,7 @@ proc test_bkpt_deletion { } {
 	gdb_test "python print (len(del_list))" \
 	    "3" "Number of breakpoints before delete"
 	gdb_continue_to_breakpoint "Break at multiply." \
-	    ".*/$srcfile:$deltst_location.*"
+	    ".*$srcfile:$deltst_location.*"
 	gdb_py_test_silent_cmd  "python dp1.delete()" \
 	    "Delete Breakpoint" 0
 	gdb_test "python print (dp1.number)" \
@@ -144,7 +144,7 @@ proc test_bkpt_deletion { } {
 	gdb_test "python print (len(del_list))" \
 	    "2" "Number of breakpoints after delete"
 	gdb_continue_to_breakpoint "Break at end." \
-	    ".*/$srcfile:$end_location.*"
+	    ".*$srcfile:$end_location.*"
     }
 }
 
@@ -356,7 +356,7 @@ proc test_bkpt_eval_funcs { } {
 	gdb_py_test_silent_cmd "python never_eval_bp1 = bp_also_eval(\"$end_location\")" \
 	    "Set breakpoint" 0
 	gdb_continue_to_breakpoint "Break at multiply, i==3" \
-	    ".*/$srcfile:$bp_location2.*"
+	    ".*$srcfile:$bp_location2.*"
 	gdb_test "print i" \
 	    "3" "Check inferior value matches python accounting"
 	gdb_test "python print (eval_bp1.inf_i)" \
@@ -395,7 +395,7 @@ proc test_bkpt_eval_funcs { } {
 	gdb_test "python print (check_eval.count)" "0" \
 	    "Test that evaluate function has not been yet executed (ie count = 0)"
 	gdb_continue_to_breakpoint "Break at multiply, count==1" \
-	    ".*/$srcfile:$bp_location2.*"
+	    ".*$srcfile:$bp_location2.*"
 	gdb_test "python print (check_eval.count)" "1" \
 	    "Test that evaluate function is run when location also has normal bp"
 
@@ -452,7 +452,7 @@ proc test_bkpt_temporary { } {
 	gdb_test "python print (ibp.temporary)" "True" \
 	    "Check breakpoint temporary status"
 	gdb_continue_to_breakpoint "Break at multiply." \
-	    ".*/$srcfile:$ibp_location.*"
+	    ".*$srcfile:$ibp_location.*"
 	gdb_test "python print (ibp.count)" "1" \
 	    "Check temporary stop callback executed before deletion."
 	gdb_test "python print (ibp.temporary)" "RuntimeError: Breakpoint 2 is invalid.*" \
diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp
index 3206e3c..f77054c 100644
--- a/gdb/testsuite/gdb.reverse/break-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/break-precsave.exp
@@ -45,7 +45,7 @@ proc precsave_tests {} {
     }
 
     gdb_test "break $end_location" \
-	"Breakpoint $decimal at .*/$srcfile, line $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"
@@ -69,10 +69,10 @@ proc precsave_tests {} {
 	"Breakpoint $decimal at .* line $bar_location\." \
 	"set breakpoint on bar"
 
-    gdb_continue_to_breakpoint "foo" ".*/$srcfile:$foo_location.*"
-    gdb_continue_to_breakpoint "bar" ".*/$srcfile:$bar_location.*"
+    gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
+    gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
     gdb_test_multiple "continue" "go to end of main forward" {
-	-re ".*Breakpoint $decimal,.*/$srcfile:$end_location.*$gdb_prompt $"  {
+	-re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $"  {
 	    pass "go to end of main forward"
 	}
 	-re "No more reverse-execution history.* end of main .*$gdb_prompt $" {
@@ -82,11 +82,11 @@ proc precsave_tests {} {
 
     gdb_test_no_output "set exec-direction reverse" "set reverse"
 
-    gdb_continue_to_breakpoint "bar backward"  ".*/$srcfile:$bar_location.*"
-    gdb_continue_to_breakpoint "foo backward"  ".*/$srcfile:$foo_location.*"
+    gdb_continue_to_breakpoint "bar backward"  ".*$srcfile:$bar_location.*"
+    gdb_continue_to_breakpoint "foo backward"  ".*$srcfile:$foo_location.*"
 
     gdb_test_multiple "continue" "main backward" {
-	-re ".*Breakpoint $decimal,.*/$srcfile:$main_location.*$gdb_prompt $" {
+	-re ".*Breakpoint $decimal,.*$srcfile:$main_location.*$gdb_prompt $" {
 	    pass "main backward"
 	}
 	-re "No more reverse-execution history.* break in main .*$gdb_prompt $" {
@@ -96,11 +96,11 @@ proc precsave_tests {} {
 
     gdb_test_no_output "set exec-direction forward" "set forward"
 
-    gdb_continue_to_breakpoint "foo" ".*/$srcfile:$foo_location.*"
-    gdb_continue_to_breakpoint "bar" ".*/$srcfile:$bar_location.*"
+    gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
+    gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
 
     gdb_test_multiple "continue" "end of record log" {
-	-re ".*Breakpoint $decimal,.*/$srcfile:$end_location.*$gdb_prompt $" {
+	-re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" {
 	    pass "end of record log"
 	}
 	-re "No more reverse-execution history.* end of main .*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.reverse/break-reverse.exp b/gdb/testsuite/gdb.reverse/break-reverse.exp
index 9cdc478..53b6fd0 100644
--- a/gdb/testsuite/gdb.reverse/break-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/break-reverse.exp
@@ -50,17 +50,17 @@ gdb_test "break $end_location" \
     "Breakpoint $decimal at .* line $end_location\." \
     set breakpoint at end of main"
 
-gdb_continue_to_breakpoint "foo" ".*/$srcfile:$foo_location.*"
-gdb_continue_to_breakpoint "bar" ".*/$srcfile:$bar_location.*"
-gdb_continue_to_breakpoint "end" ".*/$srcfile:$end_location.*"
+gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
+gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
+gdb_continue_to_breakpoint "end" ".*$srcfile:$end_location.*"
 
 gdb_test_no_output "set exec-direction reverse" "set reverse"
 
-gdb_continue_to_breakpoint "bar backward"  ".*/$srcfile:$bar_location.*"
-gdb_continue_to_breakpoint "foo backward"  ".*/$srcfile:$foo_location.*"
+gdb_continue_to_breakpoint "bar backward"  ".*$srcfile:$bar_location.*"
+gdb_continue_to_breakpoint "foo backward"  ".*$srcfile:$foo_location.*"
 
 gdb_test_multiple "continue" "main backward" {
-    -re ".*Breakpoint $decimal,.*/$srcfile:$main_location.*$gdb_prompt $" {
+    -re ".*Breakpoint $decimal,.*$srcfile:$main_location.*$gdb_prompt $" {
 	pass "main backward"
     }
     -re "No more reverse-execution history.* break in main .*$gdb_prompt $" {
@@ -70,11 +70,11 @@ gdb_test_multiple "continue" "main backward" {
 
 gdb_test_no_output "set exec-direction forward" "set forward"
 
-gdb_continue_to_breakpoint "foo" ".*/$srcfile:$foo_location.*"
-gdb_continue_to_breakpoint "bar" ".*/$srcfile:$bar_location.*"
+gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
+gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
 
 gdb_test_multiple "continue" "end of record log" {
-    -re ".*Breakpoint $decimal,.*/$srcfile:$end_location.*$gdb_prompt $" {
+    -re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" {
 	pass "end of record log"
     }
     -re "No more reverse-execution history.* end of main .*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index 45ad153..43e9d77 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -37,7 +37,7 @@ if [supports_process_record] {
 
 set end_location  [gdb_get_line_number "end of main"  ]
 gdb_test "break $end_location" \
-    "Breakpoint $decimal at .*/$srcfile, line $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"
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index 48fa7df..22c32e4 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -38,7 +38,7 @@ if [supports_process_record] {
 
 set breakloc [gdb_get_line_number "end of main" "$srcfile"]
 gdb_test "break $breakloc" \
-    "Breakpoint $decimal at .*/$srcfile, line $breakloc\." \
+    "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
     "BP at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
@@ -58,9 +58,9 @@ gdb_test "record restore $precsave" \
 
 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" {
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
index 92ad65e..11e8b5d 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
@@ -41,9 +41,9 @@ if [supports_process_record] {
 
 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.*"
 
 gdb_test "break \*void_func" \
     "Breakpoint $decimal at .*" \
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse.exp b/gdb/testsuite/gdb.reverse/finish-reverse.exp
index 30b6988..077d4ed 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse.exp
@@ -37,9 +37,9 @@ if [supports_process_record] {
 
 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" {
@@ -56,9 +56,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" {
@@ -77,7 +77,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" {
@@ -96,7 +96,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" {
@@ -115,7 +115,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" {
@@ -134,7 +134,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" {
@@ -158,7 +158,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" {
@@ -170,7 +170,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" {
@@ -182,7 +182,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" {
@@ -194,7 +194,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" {
@@ -206,7 +206,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" {
@@ -218,7 +218,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" {
diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp
index 16570e8..8b713fd 100644
--- a/gdb/testsuite/gdb.reverse/i386-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp
@@ -55,7 +55,7 @@ global hex
 global decimal
 
 gdb_test "break $end_of_main" \
-    "Breakpoint $decimal at .*/$srcfile, line $end_of_main\." \
+    "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
     "BP at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
diff --git a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp
index 5bca27a..f5b503e 100644
--- a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp
@@ -40,7 +40,7 @@ gdb_test_no_output "record"  "Turn on process record"
 # This can take awhile.
 set oldtimeout $timeout
 set timeout [expr $oldtimeout + 120]
-gdb_test "until $location" ".*/$srcfile:$location.*" \
+gdb_test "until $location" ".*$srcfile:$location.*" \
     "record to end of main"
 set timeout $oldtimeout
 
@@ -48,14 +48,14 @@ set timeout $oldtimeout
 
 set location [gdb_get_line_number "BEGIN I387-FLOAT-REVERSE"]
 gdb_test_no_output "set exec-dir reverse" "set reverse direction"
-gdb_test "until $location" ".*/$srcfile:$location.*" \
+gdb_test "until $location" ".*$srcfile:$location.*" \
     "rewind to beginning of main"
 gdb_test_no_output "set exec-dir forward" "set forward direction"
 
 # Test FPU env particularly ftag and fstatus reigters.
 
 set location [gdb_get_line_number "TEST ENV"]
-gdb_test "until $location" ".*/$srcfile:$location.*asm.*nop.*" \
+gdb_test "until $location" ".*$srcfile:$location.*asm.*nop.*" \
     "begin testing fpu env"       
 
 gdb_test "n" "asm.*fsave.*"               "save FPU env in memory"    
diff --git a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
index 2c25828..ce8297f 100644
--- a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp
@@ -37,14 +37,14 @@ runto main
 
 set location [gdb_get_line_number "END I387-FLOAT-REVERSE"]
 gdb_test_no_output "record" "Turn on process record"
-gdb_test "until $location" ".*/$srcfile:$location.*" \
+gdb_test "until $location" ".*$srcfile:$location.*" \
     "record to end of main"
 
 # Now rewind to beginning so we can begin testing.
 
 set location [gdb_get_line_number "BEGIN I387-FLOAT-REVERSE"]
 gdb_test_no_output "set exec-dir reverse" "set reverse direction"
-gdb_test "until $location" ".*/$srcfile:$location.*" \
+gdb_test "until $location" ".*$srcfile:$location.*" \
     "rewind to beginning of main"
 gdb_test_no_output "set exec-dir forward" "set forward direction"
 
@@ -53,7 +53,7 @@ gdb_test_no_output "set exec-dir forward" "set forward direction"
 # and see whether all are getting recorded.
 
 set location [gdb_get_line_number "test st0 register"]
-gdb_test "until $location" ".*/$srcfile:$location.*asm.*fld1.*" \
+gdb_test "until $location" ".*$srcfile:$location.*asm.*fld1.*" \
     "begin test st0"
 gdb_test "stepi" "asm.*fldl2t.*"              "push st0 == 1"
 gdb_test "info register st0" "st0 *1\t.*"     "verify st0 == 1"
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index e315cd9..3b62dc9 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -63,7 +63,7 @@ if [supports_process_record] {
 }
 
 gdb_test "break $endmain" \
-    "Breakpoint $decimal at .*/$srcfile, line $endmain\." \
+    "Breakpoint $decimal at .*$srcfile, line $endmain\." \
     "BP at end of main"
 
 gdb_test "continue" "Breakpoint .* end main .*" "run to end of main"
@@ -82,10 +82,10 @@ gdb_test "record restore $precsave" \
 # Proceed to end of main
 
 gdb_test "break $endmain" \
-    "Breakpoint.* file .*/$srcfile, line $endmain.*" ""
+    "Breakpoint.* file .*$srcfile, line $endmain.*" ""
 
 gdb_test_multiple "continue" "go to end of main forward" {
-    -re ".*Breakpoint $decimal,.*/$srcfile:$endmain.*$gdb_prompt $"  {
+    -re ".*Breakpoint $decimal,.*$srcfile:$endmain.*$gdb_prompt $"  {
 	pass "go to end of main forward"
     }
     -re "No more reverse-execution history.* end main .*$gdb_prompt $" {
@@ -105,8 +105,8 @@ gdb_test_multiple "continue" "go to end of main forward" {
 set breakloc [gdb_get_line_number \
 		  "module_global_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print aglobal" ".* = 0$newline"  "module global reverse-breakpoint"
 gdb_test "step"          ".* module global post-change .*" ""
@@ -120,8 +120,8 @@ gdb_test "print aglobal" ".* = 0$newline"  "module global reverse-step to bp"
 set breakloc [gdb_get_line_number \
 		  "module_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print astatic" ".* = 0$newline"  "module static reverse-breakpoint"
 gdb_test "step"          ".* module static post-change .*" ""
@@ -134,8 +134,8 @@ gdb_test "print astatic" ".* = 0$newline"  "module static reverse-step"
 set breakloc [gdb_get_line_number \
 		  "function_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "function static reverse-breakpoint"
 gdb_test "step"         ".* function static post-change .*" ""
@@ -148,8 +148,8 @@ gdb_test "print a"      ".* = 0$newline"  "function static reverse-step"
 set breakloc [gdb_get_line_number \
 		  "auto_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "auto var reverse-breakpoint"
 gdb_test "step"         ".* auto post-change .*" ""
@@ -162,8 +162,8 @@ gdb_test "print a"      ".* = 0$newline"  "auto var reverse-step"
 set breakloc [gdb_get_line_number \
 		  "register_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "register var reverse-breakpoint"
 gdb_test "step"         ".* register post-change .*" ""
@@ -173,8 +173,8 @@ gdb_test "print a"      ".* = 0$newline"  "register var reverse step-to"
 
 # Proceed to beginning of main
 
-gdb_test "tbreak $beginmain" ".*/$srcfile, line $beginmain.*" ""
-gdb_test "reverse-continue"  ".*/$srcfile:$beginmain.*" "reverse to main"
+gdb_test "tbreak $beginmain" ".*$srcfile, line $beginmain.*" ""
+gdb_test "reverse-continue"  ".*$srcfile:$beginmain.*" "reverse to main"
 
 # Now repeat tests while replaying forward.
 
@@ -183,8 +183,8 @@ gdb_test "reverse-continue"  ".*/$srcfile:$beginmain.*" "reverse to main"
 set breakloc [gdb_get_line_number \
 		  "register_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "register var forward-breakpoint"
 gdb_test "reverse-step" ".*hide.*" ""
@@ -198,8 +198,8 @@ gdb_test "print a"      ".* = 1$newline"  "register var step post-change"
 set breakloc [gdb_get_line_number \
 		  "auto_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "auto var forward-breakpoint"
 gdb_test "reverse-step" ".*hide.*" ""
@@ -213,8 +213,8 @@ gdb_test "print a"      ".* = 1$newline"  "auto var step post-change"
 set breakloc [gdb_get_line_number \
 		  "function_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "function static forward-breakpoint"
 gdb_test "reverse-step" ".*hide.*" ""
@@ -228,8 +228,8 @@ gdb_test "print a"      ".* = 1$newline"  "function static step post-change"
 set breakloc [gdb_get_line_number \
 		  "module_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print astatic" ".* = 0$newline"  "module static forward-breakpoint"
 gdb_test "reverse-step"  ".*hide.*" ""
@@ -243,8 +243,8 @@ gdb_test "print astatic" ".* = 1$newline"  "module static step post-change"
 set breakloc [gdb_get_line_number \
 		  "module_global_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print aglobal" ".* = 0$newline"  "module global forward-breakpoint"
 gdb_test "reverse-step"  ".*hide.*" ""
diff --git a/gdb/testsuite/gdb.reverse/machinestate.exp b/gdb/testsuite/gdb.reverse/machinestate.exp
index d2d2137..714571b 100644
--- a/gdb/testsuite/gdb.reverse/machinestate.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate.exp
@@ -63,8 +63,8 @@ if [supports_process_record] {
 # Proceed to end of main
 
 gdb_test "break $endmain" \
-    "Breakpoint.* file .*/$srcfile, line $endmain.*" ""
-gdb_continue_to_breakpoint "end of main" ".*/$srcfile:$endmain.*"
+    "Breakpoint.* file .*$srcfile, line $endmain.*" ""
+gdb_continue_to_breakpoint "end of main" ".*$srcfile:$endmain.*"
 
 ###
 ###
@@ -78,8 +78,8 @@ gdb_continue_to_breakpoint "end of main" ".*/$srcfile:$endmain.*"
 set breakloc [gdb_get_line_number \
 		  "module_global_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print aglobal" ".* = 0$newline"  "module global reverse-breakpoint"
 gdb_test "step"          ".* module global post-change .*" ""
@@ -93,8 +93,8 @@ gdb_test "print aglobal" ".* = 0$newline"  "module global reverse-step to bp"
 set breakloc [gdb_get_line_number \
 		  "module_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print astatic" ".* = 0$newline"  "module static reverse-breakpoint"
 gdb_test "step"          ".* module static post-change .*" ""
@@ -107,8 +107,8 @@ gdb_test "print astatic" ".* = 0$newline"  "module static reverse-step"
 set breakloc [gdb_get_line_number \
 		  "function_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "function static reverse-breakpoint"
 gdb_test "step"         ".* function static post-change .*" ""
@@ -121,8 +121,8 @@ gdb_test "print a"      ".* = 0$newline"  "function static reverse-step"
 set breakloc [gdb_get_line_number \
 		  "auto_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "auto var reverse-breakpoint"
 gdb_test "step"         ".* auto post-change .*" ""
@@ -135,8 +135,8 @@ gdb_test "print a"      ".* = 0$newline"  "auto var reverse-step"
 set breakloc [gdb_get_line_number \
 		  "register_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "reverse-continue" ".*/$srcfile:$breakloc.*" "reverse to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "register var reverse-breakpoint"
 gdb_test "step"         ".* register post-change .*" ""
@@ -146,8 +146,8 @@ gdb_test "print a"      ".* = 0$newline"  "register var reverse step-to"
 
 # Proceed to beginning of main
 
-gdb_test "tbreak $beginmain" ".*/$srcfile, line $beginmain.*" ""
-gdb_test "reverse-continue"  ".*/$srcfile:$beginmain.*" "reverse to main"
+gdb_test "tbreak $beginmain" ".*$srcfile, line $beginmain.*" ""
+gdb_test "reverse-continue"  ".*$srcfile:$beginmain.*" "reverse to main"
 
 # Now repeat tests while replaying forward.
 
@@ -156,8 +156,8 @@ gdb_test "reverse-continue"  ".*/$srcfile:$beginmain.*" "reverse to main"
 set breakloc [gdb_get_line_number \
 		  "register_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "register var forward-breakpoint"
 gdb_test "reverse-step" ".*hide.*" ""
@@ -171,8 +171,8 @@ gdb_test "print a"      ".* = 1$newline"  "register var step post-change"
 set breakloc [gdb_get_line_number \
 		  "auto_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "auto var forward-breakpoint"
 gdb_test "reverse-step" ".*hide.*" ""
@@ -186,8 +186,8 @@ gdb_test "print a"      ".* = 1$newline"  "auto var step post-change"
 set breakloc [gdb_get_line_number \
 		  "function_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print a"      ".* = 0$newline"  "function static forward-breakpoint"
 gdb_test "reverse-step" ".*hide.*" ""
@@ -201,8 +201,8 @@ gdb_test "print a"      ".* = 1$newline"  "function static step post-change"
 set breakloc [gdb_get_line_number \
 		  "module_static_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print astatic" ".* = 0$newline"  "module static forward-breakpoint"
 gdb_test "reverse-step"  ".*hide.*" ""
@@ -216,8 +216,8 @@ gdb_test "print astatic" ".* = 1$newline"  "module static step post-change"
 set breakloc [gdb_get_line_number \
 		  "module_global_state: set breakpoint here" $srcfile]
 
-gdb_test "tbreak $breakloc" ".*/$srcfile, line $breakloc.*" ""
-gdb_test "continue"         ".*/$srcfile:$breakloc.*" "forward to $breakloc"
+gdb_test "tbreak $breakloc" ".*$srcfile, line $breakloc.*" ""
+gdb_test "continue"         ".*$srcfile:$breakloc.*" "forward to $breakloc"
 
 gdb_test "print aglobal" ".* = 0$newline"  "module global forward-breakpoint"
 gdb_test "reverse-step"  ".*hide.*" ""
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index 4a4695e..3c2b81c 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -172,7 +172,7 @@ if [supports_process_record] {
 
 set breakloc [gdb_get_line_number "end of main" "$srcfile"]
 gdb_test "break $breakloc" \
-    "Breakpoint $decimal at .*/$srcfile, line $breakloc\." \
+    "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
     "BP at end of main"
 
 # Signal handlers must be disabled
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 927722b..f8f78a5 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -88,7 +88,7 @@ if [supports_process_record] {
 
 set end_of_main [gdb_get_line_number "end of main" ]
 gdb_test "break $end_of_main" \
-    "Breakpoint $decimal at .*/$srcfile, line $end_of_main\." \
+    "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
     "BP at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp
index d69cf5c..6f52e58 100644
--- a/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -41,7 +41,7 @@ if [supports_process_record] {
 
 set end_of_main [gdb_get_line_number "end of main" ]
 gdb_test "break $end_of_main" \
-    "Breakpoint $decimal at .*/$srcfile, line $end_of_main\." \
+    "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
     "BP at end of main"
 
 gdb_test "continue" "Breakpoint .* end of main .*" "run to end of main"
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index 23e557e..db643fa 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -45,7 +45,7 @@ if [supports_process_record] {
 
 set end_of_main [gdb_get_line_number "set breakpoint 10a here" ]
 gdb_test "break $end_of_main" \
-    "Breakpoint $decimal at .*/$srcfile, line $end_of_main\." \
+    "Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
     "BP at end of main"
 
 # This can take awhile.
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 096cefc..5fe1296 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -38,7 +38,7 @@ if [supports_process_record] {
 
 set end_location  [gdb_get_line_number "end of main"  ]
 gdb_test "break $end_location" \
-    "Breakpoint $decimal at .*/$srcfile, line $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"
@@ -65,7 +65,7 @@ gdb_test "break marker2" \
     "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \
     "set breakpoint at marker2"
 
-gdb_continue_to_breakpoint "marker1" ".*/$srcfile:.*"
+gdb_continue_to_breakpoint "marker1" ".*$srcfile:.*"
 
 gdb_test "watch ival3" \
     ".*\[Ww\]atchpoint $decimal: ival3.*" \
@@ -102,7 +102,7 @@ gdb_test "continue" \
 # Continue until we hit the finishing marker function.
 # Make sure we hit no more watchpoints.
 
-gdb_continue_to_breakpoint "marker2" ".*/$srcfile:.*"
+gdb_continue_to_breakpoint "marker2" ".*$srcfile:.*"
 
 ###
 ###
diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp
index ab2a0ea..20a38cf 100644
--- a/gdb/testsuite/gdb.reverse/watch-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp
@@ -46,7 +46,7 @@ gdb_test "break marker2" \
     "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \
     "set breakpoint at marker2"
 
-gdb_continue_to_breakpoint "marker1" ".*/$srcfile:.*"
+gdb_continue_to_breakpoint "marker1" ".*$srcfile:.*"
 
 gdb_test "watch ival3" \
     ".*\[Ww\]atchpoint $decimal: ival3.*" \
@@ -83,7 +83,7 @@ gdb_test "continue" \
 # Continue until we hit the finishing marker function.
 # Make sure we hit no more watchpoints.
 
-gdb_continue_to_breakpoint "marker2" ".*/$srcfile:.*"
+gdb_continue_to_breakpoint "marker2" ".*$srcfile:.*"
 
 ###
 ###
