Patchwork [testsuite,obvious] Match Windows pathnames in gdb.linespec/break-ask.exp

login
register
mail settings
Submitter Sandra Loosemore
Date Aug. 9, 2019, 8:54 p.m.
Message ID <f1c3469f-314b-3332-95f1-ed9875f1cd0e@codesourcery.com>
Download mbox | patch
Permalink /patch/34026/
State New
Headers show

Comments

Sandra Loosemore - Aug. 9, 2019, 8:54 p.m.
gdb.linespec/break-ask.exp has been ERRORing on Windows host because its 
pathname regexps had hardwired "/" directory separators while GDB was 
printing "\".  This patch fixes the regexps to match both Posix and 
Windows filename syntax.  I thought this was sufficiently obvious that I 
went ahead and checked it in (there's no change to the logic of the test).

-Sandra

Patch

commit 020a839d52fb8a28059dadd075b09a2fec84ef74
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Fri Aug 9 13:45:44 2019 -0700

    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 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 .*"