[v9,01/11,gdb/testsuite] Fix gdb.rust/watch.exp on ppc64le

Message ID 20230302220408.1925678-2-binutils@emagii.com
State Repeat Merge
Headers
Series [v9,01/11,gdb/testsuite] Fix gdb.rust/watch.exp on ppc64le |

Checks

Context Check Description
snail/binutils-gdb-check warning Git am fail log

Commit Message

Frager, Neal via Binutils March 2, 2023, 10:03 p.m. UTC
  From: Tom de Vries <tdevries@suse.de>

On x86_64-linux, I have:
...
(gdb) watch -location y^M
Hardware watchpoint 2: -location y^M
(gdb) PASS: gdb.rust/watch.exp: watch -location y
...
but on powerpc64le-linux, I run into:
...
(gdb) watch -location y^M
Watchpoint 2: -location y^M
(gdb) FAIL: gdb.rust/watch.exp: watch -location y
...
due to the regexp matching "Hardware watchpoint" but not "Watchpoint":
...
gdb_test "watch -location y" ".*watchpoint .* -location .*"
...

Fix this by making the regexp less restrictive.

Tested on x86_64-linux and powerpc64le-linux.
---
 gdb/testsuite/gdb.rust/watch.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Patch

diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp
index 83cb41cc1eb..43c88f8a1fc 100644
--- a/gdb/testsuite/gdb.rust/watch.exp
+++ b/gdb/testsuite/gdb.rust/watch.exp
@@ -30,4 +30,4 @@  if {![runto ${srcfile}:$line]} {
 }
 
 # Just setting a watchpoint was enough to trigger the bug.
-gdb_test "watch -location y" ".*watchpoint .* -location .*"
+gdb_test "watch -location y" ".*\[wW\]atchpoint .* -location .*"