From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OTU8AS9PjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:03:27 -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=qwRIg5FR; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Ena6c1nx; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=tzXpm8yB; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vT7ia5WR; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id EF32C1E0A3; Mon, 24 Aug 2026 10:03:26 -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 [38.145.34.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 322F01E033 for ; Mon, 24 Aug 2026 10:03:26 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BB0914BA2E1C for ; Mon, 24 Aug 2026 14:03:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB0914BA2E1C 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=qwRIg5FR; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Ena6c1nx; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=tzXpm8yB; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vT7ia5WR Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id D466E4BA79B1 for ; Mon, 24 Aug 2026 13:59:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D466E4BA79B1 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 D466E4BA79B1 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579954; cv=none; b=r1+EPyzrEiHRf4HXNJRKjuDTIz72vHAU9DJ10cZoQOxDg0a98oG7wMeYt4tbOgcKcM6XQLy1YaDNsasPiQwkbrgjjW1RXCdAcrKIfx2wVwxI39Td7bGU+1bJZLQReyFuYfvOxhk6C3bzPpwTyAAURw5NkYt70cVe/WeQmF0FUY0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579954; c=relaxed/simple; bh=XiJShh0tp5v8ZPP645Et06h/tzdrMsd+UNa+a+bBUO4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=C+XbTLJYb6m74Wdzv3JTq4uEcWLxWImDDJ7g6g3sZZc1SGYze4E0M7G0iLlYpzs6Gf5uCahr5DVes3gzvjqCWFdQuIfSTJEDw9hdCt9/5l9w4Snb5Cy6d8xs0gn+1BmOLzPayWwaizQFjoXrHqQ71GwZ1HWEM7knkfRyLxsUt5A= 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=qwRIg5FR; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Ena6c1nx; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=tzXpm8yB; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vT7ia5WR DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D466E4BA79B1 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-out2.suse.de (Postfix) with ESMTPS id 86B9A1F6E6 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=6aSe3URil4AFshyWxxUQ1GiMHMAUApU1SZi2Jgz7ftU=; b=qwRIg5FR9WNU5mF5QyIRluJX/lpYPsvfo/0Kt53MPGIg9+NDUuOzbkbh540YLeoZLvANi9 vfQMu59hit7EvTZQ3wIxMMDcnXv/5hAJO1O3Pp49O55X6T3OGzUVF1fV2T/SKaH6bEsj53 G2P4dl9uMTMoGSxGNJ10Ehb7OUB1LzA= 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=6aSe3URil4AFshyWxxUQ1GiMHMAUApU1SZi2Jgz7ftU=; b=Ena6c1nxU/fkHve/nGIc/W8BCn1CrbRlC8C42SAvzP3cvNPhxOsQg+sAdcpFbsYkW6Uzd8 KKAcWt8tcCxJMUCQ== Authentication-Results: smtp-out2.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=6aSe3URil4AFshyWxxUQ1GiMHMAUApU1SZi2Jgz7ftU=; b=tzXpm8yBchlbEOoiWmOHsvTp5UZue897bZYlIUbjDoLderwHuJpD5isM91SOZ8JnzLKQwO mn73+Xlj4cy0dJ8svfpOHU7NfvwJ7aGbAuGTHfSN+6NcVknBtGbZalZuS4yiDnqXOLFNAd UTu4mN6W3nU1/EjrGEyiZ7tLe11oACQ= 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=6aSe3URil4AFshyWxxUQ1GiMHMAUApU1SZi2Jgz7ftU=; b=vT7ia5WRLyepa0AvdXx3isUW1eXZxJZR92saQpVS3s7hXG2jATd9dKHLXiso6kMzkpWUi6 96obS6kJAaKMCuDA== 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 D76D41340F 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 sExrMyBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 10/11] [gdb/testsuite] Refactor exception handling in tentative_rename Date: Mon, 24 Aug 2026 15:58:54 +0200 Message-ID: <20260824135855.1195963-11-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 Use try/on-error to simplify tentative_rename. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34552 --- gdb/testsuite/lib/gdb.exp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 99468ac3ef3..e69a598bb10 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8639,17 +8639,18 @@ proc standard_temp_file {basename} { # as is and delete A. Return 1 if rename happened. proc tentative_rename { a b } { - global errorInfo errorCode - set code [catch {file rename -- $a $b} result] - if { $code == 1 && [lindex $errorCode 0] == "POSIX" \ - && [lindex $errorCode 1] == "EEXIST" } { - file delete $a - return 0 - } - if {$code == 1} { - return -code error -errorinfo $errorInfo -errorcode $errorCode $result - } elseif {$code > 1} { - return -code $code $result + try { + file rename -- $a $b + } on error {result opts} { + set errorcode [dict get $opts -errorcode] + if { [lindex $errorcode 0] == "POSIX" \ + && [lindex $errorcode 1] == "EEXIST" } { + file delete $a + return 0 + } + + # Rethrow. + return -options $opts $result } return 1 } -- 2.51.0