[PATCH] Adjust gdb.base/bp-cond-failure.exp for Cygwin

[PATCH] Adjust gdb.base/bp-cond-failure.exp for Cygwin

[Pedro Alves]

Currently on Cygwin, I get:

 Running /home/alves/gdb/src/gdb/testsuite/gdb.base/bp-cond-failure.exp ...
 FAIL: gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto: multi-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto: single-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=short: cond_eval=auto: multi-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=short: cond_eval=auto: single-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=int: cond_eval=auto: multi-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=int: cond_eval=auto: single-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=long long: cond_eval=auto: multi-loc: continue
 FAIL: gdb.base/bp-cond-failure.exp: access_type=long long: cond_eval=auto: single-loc: continue

On GNU/Linux, we see:

 Breakpoint 2.1, foo () at .../src/gdb/testsuite/gdb.base/bp-cond-failure.c:21
 21        return 0;     /* Multi-location breakpoint here.  */
 (gdb) PASS: gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto: multi-loc: continue

While on Cygwin, we see:

 Thread 1 "bp-cond-failure" hit Breakpoint 2.1, foo () at .../src/gdb/testsuite/gdb.base/bp-cond-failure.c:21
 21        return 0;     /* Multi-location breakpoint here.  */
 (gdb) FAIL: gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto: multi-loc: continue

The difference is the "Thread 1" part in the beginning of the quoted
output.  It appears on Cygwin, but not on Linux.  That's because on
Cygwin, all inferiors are multi-threaded, because both Windows and the
Cygwin runtime spawn a few helper threads.

Fix this by adjusting the gdb.base/bp-cond-failure.exp testcase to
work with either single- or multi-threaded inferiors.

The testcase passes cleanly for me after this.

Change-Id: I5ff11d06ac1748d044cef025f1e78b8f84ad3349
---
 gdb/testsuite/gdb.base/bp-cond-failure.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/bp-cond-failure.exp b/gdb/testsuite/gdb.base/bp-cond-failure.exp
index d6454549b48..4d03e7bc5fe 100644
--- a/gdb/testsuite/gdb.base/bp-cond-failure.exp
+++ b/gdb/testsuite/gdb.base/bp-cond-failure.exp
@@ -75,7 +75,7 @@ proc run_test { cond_eval access_type bpexpr nloc } {
 		 "Error in testing condition for breakpoint ${bp_num}.2:" \
 		 "Cannot access memory at address 0x0" \
 		 "" \
-		 "Breakpoint ${bp_num}.2, foo \\(c=49 ...\\) at \[^\r\n\]+:\[0-9\]+" \
+		 "(Thread \[^\r\n\]+ hit )?Breakpoint ${bp_num}.2, foo \\(c=49 ...\\) at \[^\r\n\]+:\[0-9\]+" \
 		 "${::decimal}\\s+\[^\r\n\]+ breakpoint here\\. \[^\r\n\]+"]
     } else {
 	gdb_test "continue" \
@@ -84,7 +84,7 @@ proc run_test { cond_eval access_type bpexpr nloc } {
 		 "Error in testing condition for breakpoint ${bp_num}:" \
 		 "Cannot access memory at address 0x0" \
 		 "" \
-		 "Breakpoint ${bp_num}, bar \\(\\) at \[^\r\n\]+:\[0-9\]+" \
+		 "(Thread \[^\r\n\]+ hit )?Breakpoint ${bp_num}, bar \\(\\) at \[^\r\n\]+:\[0-9\]+" \
 		 "${::decimal}\\s+\[^\r\n\]+ breakpoint here\\. \[^\r\n\]+"]
     }
 }

base-commit: e9770f7889e72297a179b5596894f4bbdb105224
-- 
2.49.0

Re: [PATCH] Adjust gdb.base/bp-cond-failure.exp for Cygwin

[Kevin Buettner]

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

> Currently on Cygwin, I get:
> 
>  Running /home/alves/gdb/src/gdb/testsuite/gdb.base/bp-cond-failure.exp
> ... FAIL: gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto:
> multi-loc: continue FAIL: gdb.base/bp-cond-failure.exp: access_type=char:
> cond_eval=auto: single-loc: continue FAIL: gdb.base/bp-cond-failure.exp:
> access_type=short: cond_eval=auto: multi-loc: continue FAIL:
> gdb.base/bp-cond-failure.exp: access_type=short: cond_eval=auto:
> single-loc: continue FAIL: gdb.base/bp-cond-failure.exp: access_type=int:
> cond_eval=auto: multi-loc: continue FAIL: gdb.base/bp-cond-failure.exp:
> access_type=int: cond_eval=auto: single-loc: continue FAIL:
> gdb.base/bp-cond-failure.exp: access_type=long long: cond_eval=auto:
> multi-loc: continue FAIL: gdb.base/bp-cond-failure.exp: access_type=long
> long: cond_eval=auto: single-loc: continue
> 
> On GNU/Linux, we see:
> 
>  Breakpoint 2.1, foo () at
> .../src/gdb/testsuite/gdb.base/bp-cond-failure.c:21 21        return 0;
>   /* Multi-location breakpoint here.  */ (gdb) PASS:
> gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto:
> multi-loc: continue
> 
> While on Cygwin, we see:
> 
>  Thread 1 "bp-cond-failure" hit Breakpoint 2.1, foo () at
> .../src/gdb/testsuite/gdb.base/bp-cond-failure.c:21 21        return 0;
>   /* Multi-location breakpoint here.  */ (gdb) FAIL:
> gdb.base/bp-cond-failure.exp: access_type=char: cond_eval=auto:
> multi-loc: continue
> 
> The difference is the "Thread 1" part in the beginning of the quoted
> output.  It appears on Cygwin, but not on Linux.  That's because on
> Cygwin, all inferiors are multi-threaded, because both Windows and the
> Cygwin runtime spawn a few helper threads.
> 
> Fix this by adjusting the gdb.base/bp-cond-failure.exp testcase to
> work with either single- or multi-threaded inferiors.
> 
> The testcase passes cleanly for me after this.

LGTM.

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

Re: [PATCH] Adjust gdb.base/bp-cond-failure.exp for Cygwin

[Pedro Alves]

Hi!

On 2025-06-06 18:21, Kevin Buettner wrote:

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

Thank you.  Pushed.