From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GU88DJROjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:00:52 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=PgS5sRFg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=q7anF1D0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=A8+hrxBf; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ml6/IleE; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2B1021E0A3; Mon, 24 Aug 2026 10:00:52 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 3F81C1E033 for ; Mon, 24 Aug 2026 10:00:51 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DC1E34BA9033 for ; Mon, 24 Aug 2026 14:00:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC1E34BA9033 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=PgS5sRFg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=q7anF1D0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=A8+hrxBf; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ml6/IleE Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 6962C4BA2E30 for ; Mon, 24 Aug 2026 13:59:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6962C4BA2E30 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6962C4BA2E30 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579945; cv=none; b=EqTMqF35xrsw04jHZCEnAIx/2SeV/RP1USht1cyTMVQYUmPzEnK1kmPGE2ZEbzLfZ0glmdrHkE9We6M+eScEKZIGchkG1Cr+GOzutWDzfC5LktANljyoC0h7Kg+fbewUSP9WD9d1ehM6Orlb9KPbS0Ae2IZ2uOdqpooJic4hCNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579945; c=relaxed/simple; bh=6X2FJXnhjvryuR4BQfOdAO4EHPSIM5b5YmpZzs6NaSA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=MkEjk/APUaTuxhl7IZLseOOoNJMIBHQ5eEVQqfPleCpT9SfAcUiUZTbB+htcMtHGe3SljDg8q7viFgDaS5zvhbYTNXNKzUxNGgU6lhKWpglAPtNbp2pNkGtns+whQWLpJxItoIu8fNrgIZYuJO8nVF4bFusGODuI3JfUoZ9nQs8= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=PgS5sRFg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=q7anF1D0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=A8+hrxBf; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ml6/IleE DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6962C4BA2E30 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 34F9D86951 for ; Mon, 24 Aug 2026 13:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579940; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3yOkoNWGBhO43xtzAZhKSRZoy1YMvHA7gxbVD97OIxU=; b=PgS5sRFgv5avyLHxaisZEvZMikliyKUxzIqQXUAKDDitKzgpUGaWT1bGOcsqh++9vwxUhH WDKkznGvrxJy8El4ogItgQAMl6Azlc0rTY8kRoa8WYi5ShynLipspO/XzCWc8iqFO0Wkz5 AGBVZepveCxGmKab5MaEYlt/t40Fzes= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579940; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3yOkoNWGBhO43xtzAZhKSRZoy1YMvHA7gxbVD97OIxU=; b=q7anF1D0O5ZT8rn8R3P/eqITauWSm/vV9h+q/hp4fPj2Oc2m+n9+rGYelPW+yxCDYD/42E AESkFqmI8n3jT2CA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=A8+hrxBf; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="ml6/IleE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579936; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3yOkoNWGBhO43xtzAZhKSRZoy1YMvHA7gxbVD97OIxU=; b=A8+hrxBfHlXKLKZPScRxg+qidTf5iOj7qKyxCqBSRci8QKF6B/ItSui0lMobJKYFZKv8t4 Co0uA1IEwrZtZILVW9KYkHk4ZajljYpPzELSC4stqIik98DUq1+0OXmOysGplmjMHOW4Qy ohN0VsQVbE1WL7Q4NAr7935tcwiCW28= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579936; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3yOkoNWGBhO43xtzAZhKSRZoy1YMvHA7gxbVD97OIxU=; b=ml6/IleEMwL58TMgX+AlZCrdPGAAozhNqbB8mxnOMias9mxCt+Wpm2xLKuxfwfHcIUuHRr Ruqn3fIloNn+Y5DA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2134C133CF for ; Mon, 24 Aug 2026 13:58:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cDvQBiBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 03/11] [gdb/testsuite] Simplify foreach_with_prefix Date: Mon, 24 Aug 2026 15:58:47 +0200 Message-ID: <20260824135855.1195963-4-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260824135855.1195963-1-tdevries@suse.de> References: <20260824135855.1195963-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:dkim]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 34F9D86951 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org In the testsuite there's a pattern for handling a catch result: ... proc foo {body} { set code [catch {uplevel 1 $body} result] if {$code == 1} { global errorInfo errorCode return -code $code -errorinfo $errorInfo -errorcode $errorCode $result } else { return -code $code $result } } ... with the intended effect that executing "foo body" has the same effect as "body". The pattern's different though in proc foreach_with_prefix: ... proc foreach_with_prefix {var list body} { upvar 1 $var myvar foreach myvar $list { with_test_prefix "$var=$myvar" { set code [catch {uplevel 1 $body} result] } if {$code == 1} { global errorInfo errorCode return -code $code -errorinfo $errorInfo -errorcode $errorCode $result } elseif {$code == 3} { break } elseif {$code == 2} { return -code $code $result } } } ... where it handles: - break ($code == 3) by breaking, and - ok and continue ($code == 0/4) by ignoring it. Move the foreach into the catch: ... set code [catch { foreach myvar $list { with_test_prefix "$var=$myvar" { uplevel 1 $body } } } result] ... to let foreach handle break and continue, allowing us to handle the catch result in the usual way. Likewise in foreach_mi_ui_mode. --- gdb/testsuite/lib/gdb.exp | 22 +++++++++++----------- gdb/testsuite/lib/mi-support.exp | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 71e38e4801a..c8254ac9dd3 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3305,19 +3305,19 @@ proc with_test_prefix { prefix body } { proc foreach_with_prefix {var list body} { upvar 1 $var myvar - foreach myvar $list { - with_test_prefix "$var=$myvar" { - set code [catch {uplevel 1 $body} result] + set code [catch { + foreach myvar $list { + with_test_prefix "$var=$myvar" { + uplevel 1 $body + } } + } result] - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } elseif {$code == 3} { - break - } elseif {$code == 2} { - return -code $code $result - } + if {$code == 1} { + global errorInfo errorCode + return -code $code -errorinfo $errorInfo -errorcode $errorCode $result + } else { + return -code $code $result } } diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 4fd3eeb0dde..2e87769b538 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -2931,19 +2931,19 @@ proc foreach_mi_ui_mode { var_name body } { set modes {"main" "separate"} } - foreach var $modes { - with_test_prefix "$var_name=$var" { - set code [catch {uplevel 1 $body} result] - } - - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } elseif {$code == 3} { - break - } elseif {$code == 2} { - return -code $code $result - } + set code [catch { + foreach var $modes { + with_test_prefix "$var_name=$var" { + uplevel 1 $body + } + } + } result] + + if {$code == 1} { + global errorInfo errorCode + return -code $code -errorinfo $errorInfo -errorcode $errorCode $result + } else { + return -code $code $result } } -- 2.51.0