From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2YrhKclOjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:01:45 -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=RXUxAJ6y; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=L++SfUki; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=euFLq94C; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=BPliwKTr; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A557D1E0A3; Mon, 24 Aug 2026 10:01:45 -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 1B6541E033 for ; Mon, 24 Aug 2026 10:01:45 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 64EAD4B9DB55 for ; Mon, 24 Aug 2026 14:01:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 64EAD4B9DB55 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=RXUxAJ6y; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=L++SfUki; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=euFLq94C; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=BPliwKTr 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 5C91A4BA9027 for ; Mon, 24 Aug 2026 13:59:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C91A4BA9027 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 5C91A4BA9027 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=1787579953; cv=none; b=emVPeJbOuiqqE2uU5YXNWzKKZwR4evCOPwv9Xn0FkWg3WGT7m1NSDnaZsZyVNJH1KkfiWng+6mvyrsLDRl0gkl2H1xVI/qsUVh1YE/JspD2xIS3XZpc6Ax+/4kwU4CzQDYrHA6WSh0S2mi0E6Tdh8oNqpOufJLVvCn4vXnpa/Qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579953; c=relaxed/simple; bh=xursIfSy8ZjGUglgE4IIuNJHLSxM5vuDIYsZupo3aKY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=a41inblofEpMVuag9dBp2NVCXHkP8tmhALlGYB3gaACw82wREev9jWOc/kaJI7wBeSzS9EyqtInWZY50j3zzhvymbOoh4wN5VO78rYRUm0/nzd1Sg62xRMnbqRY+BZZvkCQ7E7KDr+JOLzhuKPqJJug6byOq4gWSxGLJQxphvQU= 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=RXUxAJ6y; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=L++SfUki; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=euFLq94C; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=BPliwKTr DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C91A4BA9027 Received: from imap1.dmz-prg2.suse.org (unknown [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 390AA868BF for ; Mon, 24 Aug 2026 13:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579948; 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=13GrAHQja77Qo7U8nNIerCa6tp0qZVQCsxioqJspCOQ=; b=RXUxAJ6y0h68UMacLu/ADBCY0ODoCq/R2ZDy0jW3N8xRV9bIXQeD+DO1MaI4oC17z73YT3 kPGv+Oo9J7X5G4u4xgUc/jEe85/sU3N7r2FC2NE60wf9UHfHJdMSV4jIrgumISJ/xzwLDp Dkp4Otdt4PAw0Un5U8j9i+L6SIJxm5w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579948; 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=13GrAHQja77Qo7U8nNIerCa6tp0qZVQCsxioqJspCOQ=; b=L++SfUkiltDwXXVYVD8KZjqBNJOcw++uuYSJIVbo0pxzf5w2VHFkQvEZmaGuVfz4bI3rg7 i0gGT5t5JgKxzIBA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579944; 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=13GrAHQja77Qo7U8nNIerCa6tp0qZVQCsxioqJspCOQ=; b=euFLq94CW5sUu1dGvAafTyCbEpwTEc3hEXRxnGeSyea8M49l7KAsELwRzqWBU2Ws8nYJ1N dyYTjCsjk/nR+JBHfE7naMLDjpf+pNb1AZ37ht5XM1kxDfnfPZHdtuFc1vX4r+VAYybkZC 0n787Sc+Qc9tKj5Aq9Mfly3MS63MqhY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579944; 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=13GrAHQja77Qo7U8nNIerCa6tp0qZVQCsxioqJspCOQ=; b=BPliwKTrR1ayIAVrbRUyfGv9thxr4Wo7txQRq4NNvJpyUVWUYgTltkUAnD8392bA31MpI+ O7YzYAzfTgKiC0DQ== 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 8A48D133F6 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 GJ6cICBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 07/11] [gdb/testsuite] Refactor exception handling in gdb_expect Date: Mon, 24 Aug 2026 15:58:51 +0200 Message-ID: <20260824135855.1195963-8-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 [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] 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 Simplify gdb_expect using transparent_uplevel. --- gdb/testsuite/lib/gdb.exp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 2cd2603e39f..479d1229142 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -7531,16 +7531,9 @@ proc gdb_expect { args } { set tmt [get_largest_timeout] } - set code [catch \ - {uplevel remote_expect host $tmt $expcode} string] - - if {$code == 1} { - global errorInfo errorCode - - return -code error -errorinfo $errorInfo -errorcode $errorCode $string - } else { - return -code $code $string - } + transparent_uplevel [subst_vars { + remote_expect host $tmt $expcode + }] } # gdb_expect_list TEST SENTINEL LIST -- expect a sequence of outputs -- 2.51.0