[PATCH] Fix regression in gdb.ada/mi_exc_cond.exp

[PATCH] Fix regression in gdb.ada/mi_exc_cond.exp

[Tom Tromey]

Tom de Vries reported a regression due to a recent change in
gdb.ada/mi_exc_cond.exp.  This patch should fix it.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33895
---
 gdb/testsuite/gdb.ada/mi_ex_cond.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
index cfaf0577840..b901ebdd5c5 100644
--- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
+++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
@@ -38,7 +38,7 @@ if {[mi_clean_restart $::testfile]} {
 # catchpoint that uses both conditions and exception name.
 
 mi_gdb_test "-catch-exception -c \"the_test_index = 2\" -e constraint_error" \
-    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",cond=\"the_test_index = 2\",.*}" \
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",(.*,)?cond=\"the_test_index = 2\",.*}" \
     "catch C_E if the_test_index = 2"
 
 # It is important that we start the program's execution after having
-- 
2.49.0

Re: [PATCH] Fix regression in gdb.ada/mi_exc_cond.exp

[Tom de Vries]

On 2/12/26 3:45 AM, Tom Tromey wrote:
> Tom de Vries reported a regression due to a recent change in
> gdb.ada/mi_exc_cond.exp.  This patch should fix it.
> 

Hi,

I've tested this, and LGTM.

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

FWIW, I've submitted a follow-up patch cleaning up the test-case ( 
https://sourceware.org/pipermail/gdb-patches/2026-February/224928.html ).

Thanks,
- Tom

> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33895
> ---
>   gdb/testsuite/gdb.ada/mi_ex_cond.exp | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
> index cfaf0577840..b901ebdd5c5 100644
> --- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
> +++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
> @@ -38,7 +38,7 @@ if {[mi_clean_restart $::testfile]} {
>   # catchpoint that uses both conditions and exception name.
>   
>   mi_gdb_test "-catch-exception -c \"the_test_index = 2\" -e constraint_error" \
> -    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",cond=\"the_test_index = 2\",.*}" \
> +    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",(.*,)?cond=\"the_test_index = 2\",.*}" \
>       "catch C_E if the_test_index = 2"
>   
>   # It is important that we start the program's execution after having