From 292deeba7d6e0f1df99fff8c18000a1a3c481f3a Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 17 Feb 2023 15:19:12 +0000 Subject: gdb/testsuite introduce foreach_mi_ui_mode helper proc Introduce foreach_mi_ui_mode, a helper proc which can be used when tests are going to be repeated once with the MI in the main UI, and once with the MI on a separate UI. The proc is used like this: foreach_mi_ui_mode VAR { # BODY } The BODY will be run twice, once with VAR set to 'main' and once with VAR set to 'separate', inside BODY we can then change the behaviour based on the current UI mode. The point of this proc is that we sometimes shouldn't run the separate UI tests (when gdb_debug_enabled is true), and this proc hides all this logic. If the separate UI mode should not be used then BODY will be run just once with VAR set to 'main'. I've updated two tests that can make use of this helper proc. I'm going to add another similar test in a later commit. There should be no change to what is tested with this commit. Approved-By: Pedro Alves --- gdb/testsuite/gdb.mi/mi-watch.exp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gdb/testsuite/gdb.mi/mi-watch.exp') diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp index aaac761..12b9781 100644 --- a/gdb/testsuite/gdb.mi/mi-watch.exp +++ b/gdb/testsuite/gdb.mi/mi-watch.exp @@ -175,16 +175,9 @@ proc test_watchpoint_all {mi_mode type} { test_watchpoint_triggering } -if [gdb_debug_enabled] { - # gdb debug doesn't work for separate-mi-tty. - set modes {"main"} -} else { - set modes {"main" "separate"} -} - # Run the tests twice, once using software watchpoints, and another # with hardware watchpoints. -foreach_with_prefix mi-mode $modes { +foreach_mi_ui_mode mi-mode { foreach_with_prefix wp-type {"sw" "hw"} { test_watchpoint_all ${mi-mode} ${wp-type} } -- cgit v1.1