Re: [PATCH 08/11] [gdb/testsuite] Refactor exception handling in gdb_test_multiple

[Keith Seitz <keiths@redhat.com>]

Hi,

On 8/24/26 6:58 AM, Tom de Vries wrote:
> Simplify gdb_test_multiple using return -options and try/finally.
> 
> In the process, we also try to fix PR34553.
> 
> I've added a test to verify this, but it'll be only useful after remote_expect
> gets fixed [1].
> 
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34552
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34553
> 
> [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81691
> ---
>   gdb/testsuite/gdb.testsuite/gdb-test.exp | 51 ++++++++++++++++++++++++
>   gdb/testsuite/lib/gdb.exp                | 37 +++++++++--------
>   2 files changed, 69 insertions(+), 19 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.testsuite/gdb-test.exp b/gdb/testsuite/gdb.testsuite/gdb-test.exp
> index dab65f21bdb..231f0755f58 100644
> --- a/gdb/testsuite/gdb.testsuite/gdb-test.exp
> +++ b/gdb/testsuite/gdb.testsuite/gdb-test.exp
> @@ -49,6 +49,57 @@ with_test_prefix "cmd with trailing control code" {
>       }
>   }
>   
> +foreach_with_prefix variant {0 1 2} {
> +    proc level_2_inner {} {
> +	if {$::variant == 0} {
> +	    return -level 2 "return_level_2"
> +	} elseif {$::variant == 1} {
> +	    send_gdb "print 1\n"
> +	    set prompt_re [string_to_regexp "(gdb) "]
> +	    remote_expect host 10 {
> +		-re " = 1\r\n$prompt_re$" {
> +		    return -level 2 "return_level_2"
> +		}
> +	    }
> +	} else {
> +	    gdb_test_multiple "print 1" "" {
> +		-re -wrap " = 1" {
> +		    return -level 2 "return_level_2"
> +		}
> +	    }
> +	}
> +	return "inner"
> +    }
> +
> +    proc level_2_outer {} {
> +	level_2_inner
> +	return "outer"
> +    }
> +
> +    try {
> +	set res "initial"
> +	set res [level_2_outer]
> +    } finally {
> +	if {$variant == 0} {
> +	    # trivial case.
> +	    gdb_assert {$res == "return_level_2"}
> +	} elseif {$variant == 1} {
> +	    # Remove_expect case.

Typo? Should this be "remote_expect" case?

Keith

> +	    if {$res == "outer"} {
> +		# Dejagnu bug.
> +		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81691
> +		setup_xfail *-*-*
> +	    }
> +	    gdb_assert {$res == "return_level_2"}
> +	    set variant1_res $res
> +	} else {
> +	    # Gdb_test_multiple case. This should work if the remote_expect
> +	    # case works.
> +	    gdb_assert {$res == $variant1_res}
> +	}
> +    }
> +}
> +
>   # Change the prompt.
>   set prompt "(GDB) "
>   set prompt_re "\\(GDB\\) $"