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

[Kevin Buettner <kevinb@redhat.com>]

On Wed, 4 Mar 2026 07:40:18 +0100
Tom de Vries <tdevries@suse.de> wrote:

> While indeed the comment at the top mentions read watchpoints, the 
> test-case contains some hardcoded downgrading to regular watchpoints for 
> [istarget "s390*-*-*"], and consequently most of the test-case passes on 
> s390x.
> 
> It's only the last bit (which runs size8twice) that fails, so moving the 
> check here:
> ...
> +	if {![allow_hw_watchpoint_access_tests]} {
> +	    continue
> +	}
>   	set cmd "rwatch"
> ...
> is a more minimal fix, in the sense that it only skips the failing test.
> 
> Approved-By: Tom de Vries <tdevries@suse.de>

Agreed; that is a better way to do it.  After testing, this is what I pushed:

gdb/testsuite: Skip rwatch in watchpoint-unaligned.exp on s390x

The watchpoint-unaligned.exp test requires both read and write
hardware watchpoints.  s390x only supports write watchpoints, causing
one test failure when the rwatch command fails with "Target does not
support this type of hardware watchpoint."

This commit causes the test using the rwatch command in this file to
be skipped when allow_hw_watchpoint_access_tests is false.

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

diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
index d3bba6ae010..8b929e5de4e 100644
--- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
@@ -219,6 +219,9 @@ foreach_with_prefix fun { write_size8twice read_size8twice } {
     if { $fun == "write_size8twice" } {
 	set cmd "watch"
     } else {
+	if {![allow_hw_watchpoint_access_tests]} {
+	    continue
+	}
 	set cmd "rwatch"
     }
     foreach_with_prefix offset { 0 1 } {