From 0eade9c77cd7582fd6fe23cee3ed569a9115a6ba Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 28 Feb 2023 13:32:23 +0100 Subject: [PATCH 2/9] [gdb/testsuite] Fix gdb.rust/watch.exp on ppc64le 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(-) diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index b709c00e394..5c4636ef7a8 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -32,4 +32,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 .*" -- 2.35.3