[PATCH] Adjust gdb.arch/amd64-watchpoint-downgrade.exp for Cygwin

[PATCH] Adjust gdb.arch/amd64-watchpoint-downgrade.exp for Cygwin

[Pedro Alves]

The gdb.arch/amd64-watchpoint-downgrade.exp testcase is assuming the
output of debugging a single-thread program, like so, on e.g.,
GNU/Linux:

 starti
 Starting program: .../gdb.arch/amd64-watchpoint-downgrade/amd64-watchpoint-downgrade
 warning: watchpoint 1 downgraded to software watchpoint

 Program stopped.
 0x00007ffff7fe32b0 in _start () from /lib64/ld-linux-x86-64.so.2

However, on Cygwin, where all inferiors are multi-threaded (because
both Windows and the Cygwin runtime spawn a few helper threads), we
get:

 starti
 Starting program: .../gdb.arch/amd64-watchpoint-downgrade/amd64-watchpoint-downgrade
 [New Thread 4652.0x17e4]
 warning: watchpoint 1 downgraded to software watchpoint

 Thread 1 stopped.
 0x00007ffbfc1c0911 in ntdll!LdrInitShimEngineDynamic () from C:/Windows/SYSTEM32/ntdll.dll

This commit adjusts the testcase to work with either output.

Change-Id: I3aedfec04924ea3fb3bb87ba3251e2b720f8d59c
---
 gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
index dcee0407094..72db13e141c 100644
--- a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
+++ b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
@@ -58,7 +58,7 @@ gdb_test "starti" \
     [multi_line \
 	 "warning: watchpoint $num downgraded to software watchpoint" \
 	 "" \
-	 "Program stopped\\." \
+	 "(Program|Thread 1) stopped\\." \
 	 ".*"]
 
 # Watchpoint should now have downgraded to a s/w watchpoint.
-- 
2.49.0

Re: [PATCH] Adjust gdb.arch/amd64-watchpoint-downgrade.exp for Cygwin

[Kevin Buettner]

On Fri,  6 Jun 2025 17:59:30 +0100
Pedro Alves <pedro@palves.net> wrote:

> The gdb.arch/amd64-watchpoint-downgrade.exp testcase is assuming the
> output of debugging a single-thread program, like so, on e.g.,
> GNU/Linux:
> 
>  starti
>  Starting program: .../gdb.arch/amd64-watchpoint-downgrade/amd64-watchpoint-downgrade
>  warning: watchpoint 1 downgraded to software watchpoint
> 
>  Program stopped.
>  0x00007ffff7fe32b0 in _start () from /lib64/ld-linux-x86-64.so.2
> 
> However, on Cygwin, where all inferiors are multi-threaded (because
> both Windows and the Cygwin runtime spawn a few helper threads), we
> get:
> 
>  starti
>  Starting program: .../gdb.arch/amd64-watchpoint-downgrade/amd64-watchpoint-downgrade
>  [New Thread 4652.0x17e4]
>  warning: watchpoint 1 downgraded to software watchpoint
> 
>  Thread 1 stopped.
>  0x00007ffbfc1c0911 in ntdll!LdrInitShimEngineDynamic () from C:/Windows/SYSTEM32/ntdll.dll
> 
> This commit adjusts the testcase to work with either output.

Approved-by: Kevin Buettner <kevinb@redhat.com>

Re: [PATCH] Adjust gdb.arch/amd64-watchpoint-downgrade.exp for Cygwin

[Pedro Alves]

Pushed.