Match Windows pathnames in gdb.linespec/break-ask.exp.

2019-08-09  Sandra Loosemore  <sandra@codesourcery.com>

	gdb/testsuite/
	* gdb.linespec/break-ask.exp: Generalize regexps to match
	Windows pathnames too.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eaf6390426650fa4928e19930aa137a109f3e393..ddd81558fa7a35e658a6e46dfa97de7402ba9d77 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-09  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * gdb.linespec/break-ask.exp: Generalize regexps to match
+       Windows pathnames too.
+
 2019-08-08  Tom de Vries  <tdevries@suse.de>
 
        PR testsuite/24862

diff --git a/gdb/testsuite/gdb.linespec/break-ask.exp b/gdb/testsuite/gdb.linespec/break-ask.exp
index f5928ab1ad12d5a5276c8b35110a57048ba83af9..44741548d9020f5d5df783aa1f718127d2475504 100644 (file)
--- a/gdb/testsuite/gdb.linespec/break-ask.exp
+++ b/gdb/testsuite/gdb.linespec/break-ask.exp
@@ -53,7 +53,7 @@ gdb_test_no_output "set filename-display absolute"
 set cmd "break twodup"
 set test "break twodup absolute"
 gdb_test_multiple $cmd $test {
-    -re "^$cmd\r\n\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] \[^\r\n\]+/base/one/thefile\\.cc:twodup\\\(\\\)\r\n\\\[3\\\] \[^\r\n\]+/base/two/thefile\\.cc:twodup\\\(\\\)\r\n> $" {
+    -re "^$cmd\r\n\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] \[^\r\n\]+base.one.thefile\\.cc:twodup\\\(\\\)\r\n\\\[3\\\] \[^\r\n\]+base.two.thefile\\.cc:twodup\\\(\\\)\r\n> $" {
        pass $test
     }
 }
@@ -75,7 +75,7 @@ gdb_breakpoint "body_elsewhere"
 gdb_run_cmd
 gdb_test "" "Breakpoint \[0-9\]+, twodup \\(\\) at thefile.cc:\[0-9\]+\r\n.*" "expect breakpoint"
 
-gdb_test "info source" "\r\nLocated in \[^\r\n\]+/base/one/thefile\\.cc\r\n.*"
+gdb_test "info source" "\r\nLocated in \[^\r\n\]+base.one.thefile\\.cc\r\n.*"
 
 gdb_continue_to_breakpoint "body_elsewhere" ".* body_elsewhere marker .*"
 
@@ -95,6 +95,6 @@ gdb_breakpoint "body_elsewhere"
 gdb_run_cmd
 gdb_test "" "Breakpoint \[0-9\]+, twodup \\(\\) at thefile.cc:\[0-9\]+\r\n.*" "expect breakpoint other"
 
-gdb_test "info source" "\r\nLocated in \[^\r\n\]+/base/two/thefile\\.cc\r\n.*" "info source other"
+gdb_test "info source" "\r\nLocated in \[^\r\n\]+.base.two.thefile\\.cc\r\n.*" "info source other"
 
 gdb_continue_to_breakpoint "body_elsewhere other" ".* body_elsewhere marker .*"