Re: [PATCH 08/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop-exit.exp

[Pedro Alves <pedro@palves.net>]

On 2021-11-26 23:00, Lancelot SIX via Gdb-patches wrote:
> When running the testsuite, I have:
> 
>     Running .../gdb/testsuite/gdb.mi/mi-nonstop-exit.exp ...
>     DUPLICATE: gdb.mi/mi-nonstop-exit.exp: breakpoint at main
>     DUPLICATE: gdb.mi/mi-nonstop-exit.exp: mi runto main
> 
> This test runs the same sequence of operations twice.  Refactor the code
> by running both of those sequences within a foreach_with_prefix block to
> ensure that the commands have unique test names.
> 
> There is a slight modification of behaviour introduced by this patch.
> mi_delete_breakpoints is called one more time just before quitting gdb,
> which is in my opinion is worth given the simplification.

It's much more typical to delete breakpoints _before_ running to main.  I.e.,
putting the "restart" code at the beginning.  If that works, I'd mildly prefer that.

This is OK either way.

> 
> Tested on x86_64-linux.
> ---
>  gdb/testsuite/gdb.mi/mi-nonstop-exit.exp | 22 +++++++---------------
>  1 file changed, 7 insertions(+), 15 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
> index 99ac92f15a3..740856ca822 100644
> --- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
> +++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
> @@ -39,24 +39,16 @@ save_vars { GDBFLAGS } {
>  mi_gdb_test "-gdb-set mi-async 1" ".*"
>  mi_detect_async
>  
> -if { [mi_runto_main] < 0 } {
> -    continue
> -}
> -
> -mi_send_resuming_command "exec-continue" "continue"
> -
> -mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue"
> +foreach_with_prefix iteration {1 2} {
> +    if { [mi_runto_main] < 0 } {
> +        continue
> +    }
>  
> -# Run the program again.
> +    mi_send_resuming_command "exec-continue" "continue"
>  
> -mi_delete_breakpoints
> +    mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue"
>  
> -if { [mi_runto_main] < 0 } {
> -    continue
> +    mi_delete_breakpoints
>  }
>  
> -mi_send_resuming_command "exec-continue" "continue (2)"
> -
> -mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue (2)"
> -
>  mi_gdb_exit
>