From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id s029OmFWtWodqD0AWB0awg (envelope-from ) for ; Thu, 24 Sep 2026 12:57:05 -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=NfLtM3DK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XymD1pfc; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1yjOoskn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=8bvvH2mX; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id C77821E01F; Thu, 24 Sep 2026 12:57:05 -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 293EE1E01F for ; Thu, 24 Sep 2026 12:57:04 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 011324BB5929 for ; Thu, 24 Sep 2026 16:57:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 011324BB5929 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=NfLtM3DK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XymD1pfc; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1yjOoskn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=8bvvH2mX 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 B10DF4BB58FF for ; Thu, 24 Sep 2026 16:56:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B10DF4BB58FF 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 B10DF4BB58FF 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=1790268999; cv=none; b=mbVhGE12To21Eg1BBqCar9gU8sIPrG1hiflMhVNxhnhROhLDF8v4mRMcyQwU0poSOHtWEa8K/4wG5P8+vmG+rZww8NULvE6cg0OXQnRLl4UsuSMO7CCOp8Jrt2RnRwYOMdPey+K/R6djllT71AApM5gC5njDOaZlA5/rIXkGJQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790268999; c=relaxed/simple; bh=3OJvkFnA7+Lr6JAmG+uxDx/s14SlbgpA8ismvssLcl4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=PExL79vlohBc8mKbPrbo9S9HfstMejntET1aJtB8yj3xPMiK3qFpUDSKRUeRZO2C1OUnOF61UTskfxUZh6HOpq1SfHb6ebOJSolzJZ6mMxbuU6JWJnZS5O+XOAbt43nJf+okyduZ0T6y7VqPqDZeRTnsUJB+IHSLrlvduUNaVes= 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=NfLtM3DK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XymD1pfc; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1yjOoskn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=8bvvH2mX DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B10DF4BB58FF 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 7A312200C4 for ; Thu, 24 Sep 2026 16:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790268994; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UL0hSVDHbJHL9msJQ/N2ZC6TJC1iwxAoECNfOyvz0L4=; b=NfLtM3DKFS5byQtQl4iy1lM+g646CsEzufsNNEtvY8ZomX/0EqeVdDyHeEV7RFPI2gD/zb UciVdCtGaFnNAu7SJk0W2JZV97zJKaOviN4d9mDoBl110A3w1jJf5jQq5rg330kxaQX2qY E87IwOL9eG+ai72pfzj8u9FHsPoR7cU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790268994; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UL0hSVDHbJHL9msJQ/N2ZC6TJC1iwxAoECNfOyvz0L4=; b=XymD1pfcKG56Paql3tutdThKOCugGD4r4kNfaL3y8P15Li6rCNEkEgySFxnuFW4siVkFBl Fe5WBFk0jkGK1bDw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790268990; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UL0hSVDHbJHL9msJQ/N2ZC6TJC1iwxAoECNfOyvz0L4=; b=1yjOosknC8idpF9GfQ1UGfhk9dpiAxPhiXh4HTBBqOXxPswZQVEc36+0lGPDsjv9x97OdR Gfnb9TjT0WFQs40NYaJAug400odRbkhHcymLG+ESTYX5qQs5TqVWmqONbMqf8uQ41X4VXK VlVtkgiPEAU14HQCp35AUKModZLXBZU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790268990; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UL0hSVDHbJHL9msJQ/N2ZC6TJC1iwxAoECNfOyvz0L4=; b=8bvvH2mXU4Q0l6tTRPjXR5SFpZCZrNNvUHik5FhbxSeiYy8JgWjcPs+vNeNaV3J2oFXo6X kNGHy5D7tZnHjkDg== 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 398FF13354 for ; Thu, 24 Sep 2026 16:56:30 +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 oZwKBD5WtWo7OQAAD6G6ig (envelope-from ) for ; Thu, 24 Sep 2026 16:56:30 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Use try trap in lib/gdb.exp Date: Thu, 24 Sep 2026 18:56:29 +0200 Message-ID: <20260924165629.2649925-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 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)[-0.993]; 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 The try ... finally construct has two types of handlers [1]: - on code variableList script - trap pattern variableList script Use a trap handler to simplify file_rename_atomic and tentative_rename. In the process, fix the return value of file_rename_atomic. Currently it returns the return value of catch, so either 0 (TCL_OK) or 1 (TCL_ERROR). Change this to more typical Tcl return values: - use 1 for successful rename, and - use 0 for ignored failure to rename. [1] https://www.tcl-lang.org/man/tcl8.6/TclCmd/try.htm --- gdb/testsuite/lib/gdb.exp | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 8db13cc9f98..0c697b0b976 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -6436,18 +6436,14 @@ proc quote_for_host { args } { # atomic commit, and it doesn't matter which one wins, as all the # copies are identical. proc file_rename_atomic {src dst} { - set rc [catch { file rename -force -- $src $dst } err opts] - - if {$rc} { - set code [dict get $opts -errorcode] - if {[llength $code] >= 2 && [lindex $code 1] eq "EBUSY"} { - # Normal parallel race loss. - } else { - error $err $opts - } + try { + file rename -force -- $src $dst + } trap "POSIX EBUSY" {} { + # Normal parallel race loss. + return 0 } - return $rc + return 1 } # Set while linker_supports_manifest_embed is running its test link, @@ -8685,17 +8681,11 @@ proc standard_temp_file {basename} { proc tentative_rename { a b } { 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 + } trap "POSIX EEXIST" {} { + file delete $a + return 0 } + return 1 } base-commit: f73f2dfbb90d37443d9562f5fccf5e210920ed3a -- 2.51.0