aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandra Loosemore <sandra@codesourcery.com>2019-08-09 13:45:44 -0700
committerSandra Loosemore <sandra@codesourcery.com>2019-08-09 13:45:44 -0700
commit020a839d52fb8a28059dadd075b09a2fec84ef74 (patch)
tree6d7e0d5b81a151b0da9beb6e4c7b4662a688e65d
parentdac36daf78653a8e4688b825cdb15461a88470d2 (diff)
downloadgdb-020a839d52fb8a28059dadd075b09a2fec84ef74.zip
gdb-020a839d52fb8a28059dadd075b09a2fec84ef74.tar.gz
gdb-020a839d52fb8a28059dadd075b09a2fec84ef74.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.linespec/break-ask.exp6
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eaf6390..ddd8155 100644
--- 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 f5928ab..4474154 100644
--- 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 .*"