From dd1655dfc3468a8ce43b684e817acedec53f0980 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 23 Nov 2021 13:42:13 +0000 Subject: [PATCH] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop-exit.exp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. Tested on x86_64-linux. --- gdb/testsuite/gdb.mi/mi-nonstop-exit.exp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp index 17e8de5b8bd..9e650b82534 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp @@ -39,24 +39,15 @@ 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} { + mi_delete_breakpoints + if { [mi_runto_main] < 0 } { + continue + } -# Run the program again. + mi_send_resuming_command "exec-continue" "continue" -mi_delete_breakpoints - -if { [mi_runto_main] < 0 } { - continue + mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue" } -mi_send_resuming_command "exec-continue" "continue (2)" - -mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue (2)" - mi_gdb_exit -- 2.30.2