[PATCH] gdb/testsuite: Skip gdb.base/watchpoint-adjacent.exp on s390x

[PATCH] gdb/testsuite: Skip gdb.base/watchpoint-adjacent.exp on s390x

[Kevin Buettner]

The watchpoint-adjacent.exp test requires both read and write hardware
watchpoints.  s390x only supports write watchpoints, causing 108 test
failures when rwatch commands fail with "Target does not support this
type of hardware watchpoint."

Add a require for allow_hw_watchpoint_access_tests to skip this test on
architectures without read watchpoint support.
---
 gdb/testsuite/gdb.base/watchpoint-adjacent.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.base/watchpoint-adjacent.exp b/gdb/testsuite/gdb.base/watchpoint-adjacent.exp
index 901a383c5b5..3c3316059ad 100644
--- a/gdb/testsuite/gdb.base/watchpoint-adjacent.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-adjacent.exp
@@ -20,7 +20,7 @@
 # Multiple inferiors are compiled, using a variety of types for the
 # two fields.
 
-require allow_hw_watchpoint_multi_tests
+require allow_hw_watchpoint_multi_tests allow_hw_watchpoint_access_tests
 
 standard_testfile
 
-- 
2.53.0

Re: [PATCH] gdb/testsuite: Skip gdb.base/watchpoint-adjacent.exp on s390x

[Tom de Vries]

On 3/3/26 3:46 AM, Kevin Buettner wrote:
> The watchpoint-adjacent.exp test requires both read and write hardware
> watchpoints.  s390x only supports write watchpoints, causing 108 test
> failures when rwatch commands fail with "Target does not support this
> type of hardware watchpoint."
> 
> Add a require for allow_hw_watchpoint_access_tests to skip this test on
> architectures without read watchpoint support.

Hi Kevin,

thanks for fixing this, LGTM.

Approved-By: Tom de Vries <tdevries@suse.de>

BTW, it looks like this needs a similar fix:
...
(gdb) rwatch data.u.size8twice[0]^M
Target does not support this type of hardware watchpoint.^M
(gdb) FAIL: gdb.base/watchpoint-unaligned.exp: fun=read_size8twice: 
offset=0: index=0: rwatch data.u.size8twice[0]
...

Thanks,
- Tom

> ---
>   gdb/testsuite/gdb.base/watchpoint-adjacent.exp | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.base/watchpoint-adjacent.exp b/gdb/testsuite/gdb.base/watchpoint-adjacent.exp
> index 901a383c5b5..3c3316059ad 100644
> --- a/gdb/testsuite/gdb.base/watchpoint-adjacent.exp
> +++ b/gdb/testsuite/gdb.base/watchpoint-adjacent.exp
> @@ -20,7 +20,7 @@
>   # Multiple inferiors are compiled, using a variety of types for the
>   # two fields.
>   
> -require allow_hw_watchpoint_multi_tests
> +require allow_hw_watchpoint_multi_tests allow_hw_watchpoint_access_tests
>   
>   standard_testfile
>   

Re: [PATCH] gdb/testsuite: Skip gdb.base/watchpoint-adjacent.exp on s390x

[Kevin Buettner]

On Tue, 3 Mar 2026 09:56:24 +0100
Tom de Vries <tdevries@suse.de> wrote:

> On 3/3/26 3:46 AM, Kevin Buettner wrote:
> > The watchpoint-adjacent.exp test requires both read and write hardware
> > watchpoints.  s390x only supports write watchpoints, causing 108 test
> > failures when rwatch commands fail with "Target does not support this
> > type of hardware watchpoint."
> > 
> > Add a require for allow_hw_watchpoint_access_tests to skip this test on
> > architectures without read watchpoint support.  
> 
> Hi Kevin,
> 
> thanks for fixing this, LGTM.
> 
> Approved-By: Tom de Vries <tdevries@suse.de>

Thanks for the quick approval.  I've pushed it.

> BTW, it looks like this needs a similar fix:
> ...
> (gdb) rwatch data.u.size8twice[0]^M
> Target does not support this type of hardware watchpoint.^M
> (gdb) FAIL: gdb.base/watchpoint-unaligned.exp: fun=read_size8twice: 
> offset=0: index=0: rwatch data.u.size8twice[0]

Yes, I see this one too.  I'll take care of it.  Expect a patch sometime
soon...

Kevin