From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id d19GCmqWtWptuT4AWB0awg (envelope-from ) for ; Thu, 24 Sep 2026 17:30:18 -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=PqnBBJ9N; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9uPviOii; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Wklfcqyo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MA59h3ct; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 176621E01F; Thu, 24 Sep 2026 17:30:18 -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 908691E01F for ; Thu, 24 Sep 2026 17:30:16 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0ED8A4BB58D3 for ; Thu, 24 Sep 2026 21:30:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0ED8A4BB58D3 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=PqnBBJ9N; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9uPviOii; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Wklfcqyo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MA59h3ct Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id E3E4F4BB5896 for ; Thu, 24 Sep 2026 21:29:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E3E4F4BB5896 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 E3E4F4BB5896 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790285390; cv=none; b=mhgxPUxoKYdh9/47NWb775BnbAvzVaFt3I0Q8gNvfipYbAxDzeI7ZCa0DEOPOgl214FVOXjxUSXJupZJNkYDXCH6RvCytU+QXndM5s5xDLxNUEOrBuBPuY6sK4IJxreVWDdedZe/3n/fMLGWTtIezIN8I6Ke4fJSrMGV5fNkvAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790285390; c=relaxed/simple; bh=7izVMKkAxzufIn3pIK6aXJbzSJRgfAWWMZcvMFpizGE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=HI7unNUE39+RoL0j8+K/LKCqkod8bVt7Gg6+74l0jkwsEudLxSZK7HLYMVpJKPD3H1M819/2fM+tuVzGnLUIjOTda8TiPr1TIQTyFYNAyaAm9jtcxVq3RUAQt9hRDNeINI4hjMknBsHdOW+gZY1jRl/AFq8Nn+FR3KkaOTJlZNI= 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=PqnBBJ9N; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9uPviOii; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Wklfcqyo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=MA59h3ct DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E3E4F4BB5896 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 C8C7F21EB6 for ; Thu, 24 Sep 2026 21:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790285384; 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=VAUemIUpQC4vEBNL0IYjVJD8KFXPu/GPdjXAQ+n0b8Y=; b=PqnBBJ9NfwaCjB1dD1Hhj5MiRnCM4LaZywoc2oQblBoqIf1Fi3GhWwTTcIFHWDd1+vfg1+ FVe9iikmfKYu4FsG9lBJ1dRSnt5rPctoKEf0b6D/qzzTZ/YxuV2sohZynwJhdEUaHVShqr Jt5NqtCPu9aF3xb1Ly3LRd21zZm/nEM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790285384; 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=VAUemIUpQC4vEBNL0IYjVJD8KFXPu/GPdjXAQ+n0b8Y=; b=9uPviOiiz196Q7+rccAgPuZarIotY6yy6oV0Tc8KkPXcdYPpR759MP3hUQVIIIzErIrgBT EngEc/NIdL1QPdBw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Wklfcqyo; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=MA59h3ct DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790285382; 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=VAUemIUpQC4vEBNL0IYjVJD8KFXPu/GPdjXAQ+n0b8Y=; b=WklfcqyoiknxyTzAiKB91pusnhkGUfMNJu1INOKcLYP3l/Z7/RDhECFIkk208jdZoItlJF 0jvXnffihMQw7hP8SveTvGPyW1lrw+m/xnxFKIQ8Y1MSVzElUw6aATp2zgOuPgslt2akVM seWEuL9rnUpU1WAIOwXfRyvaHxbgWJE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790285382; 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=VAUemIUpQC4vEBNL0IYjVJD8KFXPu/GPdjXAQ+n0b8Y=; b=MA59h3ctIyIkuVGIVSn0jy61FFJ5/XvGSTc9luMmfMi095vu0TgvfphdyXz8k8el8EKvwR wLoVGINLkhSMCADQ== 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 7154213354 for ; Thu, 24 Sep 2026 21:29:42 +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 Gow7EUaWtWpecgAAD6G6ig (envelope-from ) for ; Thu, 24 Sep 2026 21:29:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Eliminate return -code Date: Thu, 24 Sep 2026 23:29:41 +0200 Message-ID: <20260924212941.1575671-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: C8C7F21EB6 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:mid]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, suse.de:mid, imap1.dmz-prg2.suse.org:rdns, imap1.dmz-prg2.suse.org:helo] 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 A statement: ... return -code return ... is equivalent to: ... transparent_uplevel { return } ... The -code stuff is shorter and native Tcl, but hard to understand. The transparent_uplevel is more intuitive, so replace the former with the latter. Likewise for continue and break. --- gdb/testsuite/gdb.base/commands.exp | 4 +++- gdb/testsuite/gdb.base/foll-vfork.exp | 24 +++++++++---------- gdb/testsuite/gdb.base/hook-stop.exp | 4 +++- gdb/testsuite/gdb.cp/breakpoint.exp | 4 +++- gdb/testsuite/gdb.mi/mi-nonstop.exp | 4 +++- gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp | 4 +++- gdb/testsuite/gdb.mi/mi-watch-nonstop.exp | 4 +++- .../access-mem-running-thread-exit.exp | 6 +++-- .../gdb.threads/interrupt-while-step-over.exp | 4 +++- .../process-dies-while-detaching.exp | 4 +++- gdb/testsuite/lib/compile-support.exp | 4 +++- gdb/testsuite/lib/gdb.exp | 18 ++++++++------ 12 files changed, 54 insertions(+), 30 deletions(-) diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index c64c5fa3135..f7e6f3a4c5b 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -41,7 +41,9 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } { proc runto_or_return {function} { if { ![runto factorial] } { - return -code return + transparent_uplevel { + return + } } } diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp index c4eac8bb4f6..cacf61ad755 100644 --- a/gdb/testsuite/gdb.base/foll-vfork.exp +++ b/gdb/testsuite/gdb.base/foll-vfork.exp @@ -50,11 +50,16 @@ if { [is_remote target] } { # Start with a fresh GDB, with verbosity enabled, and run to main. On # error, behave as "return", so we don't try to continue testing with # a borked session. -proc setup_gdb { binfile srcfile } { +proc setup_gdb { binfile srcfile {message ""} } { clean_restart $binfile if {![runto_main]} { - return -code return + if {$message != ""} { + unsupported $message + } + transparent_uplevel { + return + } } gdb_breakpoint [gdb_get_line_number " VFORK " $srcfile] -temporary @@ -62,14 +67,7 @@ proc setup_gdb { binfile srcfile } { } proc check_vfork_catchpoints {} { - # Because setup_gdb uses 'return -code return' which would return to - # our caller we need to wrap this call, spot when setup_gdb failed - # (with return code 2), and then issue our own 'return -code return'. - set code [catch {setup_gdb $::binfile $::srcfile} string] - if { $code == 2 } { - unsupported "vfork catchpoints" - return -code return - } + setup_gdb $::binfile $::srcfile "vfork catchpoints" # Verify that the system supports "catch vfork". gdb_test "catch vfork" "Catchpoint \[0-9\]* \\(vfork\\)" "insert first vfork catchpoint" @@ -85,8 +83,10 @@ proc check_vfork_catchpoints {} { } if {$has_vfork_catchpoints == 0} { - unsupported "vfork catchpoints" - return -code return + unsupported "vfork catchpoints" + transparent_uplevel { + return + } } } diff --git a/gdb/testsuite/gdb.base/hook-stop.exp b/gdb/testsuite/gdb.base/hook-stop.exp index de2fd14c703..27016db3c87 100644 --- a/gdb/testsuite/gdb.base/hook-stop.exp +++ b/gdb/testsuite/gdb.base/hook-stop.exp @@ -40,7 +40,9 @@ proc setup {commands} { clean_restart $::testfile if {![runto_main]} { - return -code return + transparent_uplevel { + return + } } gdb_test "break func" \ diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp index 936015e6709..57db933b03a 100644 --- a/gdb/testsuite/gdb.cp/breakpoint.exp +++ b/gdb/testsuite/gdb.cp/breakpoint.exp @@ -33,7 +33,9 @@ proc test_breakpoint {name} { # Restart the program every time, so that a single failure doesn't # lead to a cascade. if {![runto_main]} { - return -code continue + transparent_uplevel { + continue + } } else { gdb_breakpoint "${name}" gdb_test "continue" "Continuing.\r\n\r\nBreakpoint \[0-9\]*, ${name}.*" "continue to ${name}" diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp index 970b11a2f8e..d350de2df62 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp @@ -24,7 +24,9 @@ proc mi_nonstop_resume { command test } { # If a resume fails, assume non-stop is broken or unsupported # for this target. We have logged a FAIL or UNSUPPORTED; skip # the remaining tests to limit timeouts. - return -code continue + transparent_uplevel { + continue + } } } diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp index d5f6a1ec16b..7e72b456ce2 100644 --- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp +++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp @@ -26,7 +26,9 @@ proc mi_nonstop_resume { command test } { # If a resume fails, assume non-stop is broken or unsupported # for this target. We have logged a FAIL or UNSUPPORTED; skip # the remaining tests to limit timeouts. - return -code continue + transparent_uplevel { + continue + } } } diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp index 7f972ea6ea6..da9c24618eb 100644 --- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp @@ -23,7 +23,9 @@ proc mi_nonstop_resume { command test } { # If a resume fails, assume non-stop is broken or unsupported # for this target. We have logged a FAIL or UNSUPPORTED; skip # the remaining tests to limit timeouts. - return -code continue + transparent_uplevel { + continue + } } } diff --git a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp index d0db40c4be5..d8e431fee7b 100644 --- a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp +++ b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp @@ -144,8 +144,10 @@ proc test { non_stop } { if {[gdb_test -nopass \ $cmd $pattern "access mem ($message, inf=$inf, iter=$iter)"] \ != 0} { - uplevel 1 {set ok 0} - return -code break + transparent_uplevel { + set ok 0 + break + } } } diff --git a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp index e8b29dce2fa..ee5a0a7b218 100644 --- a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp +++ b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp @@ -63,7 +63,9 @@ proc enable_debug {enable} { proc return_if_nonzero { result } { if {$result != 0} { - return -code return $result + transparent_uplevel { + return $result + } } } diff --git a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp index edc15f25b06..edc5d0b1da7 100644 --- a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp +++ b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp @@ -68,7 +68,9 @@ proc test_server_exit {} { proc return_if_fail { result } { if {$result != 0} { - return -code return + transparent_uplevel { + return + } } } diff --git a/gdb/testsuite/lib/compile-support.exp b/gdb/testsuite/lib/compile-support.exp index 8b6e7f8c9fb..e673088c972 100644 --- a/gdb/testsuite/lib/compile-support.exp +++ b/gdb/testsuite/lib/compile-support.exp @@ -210,7 +210,9 @@ namespace eval ::CompileExpression { } } if {!$ok} { - return -code return 0 + transparent_uplevel { + return 0 + } } } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 0c697b0b976..9ade9a16818 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -11581,14 +11581,18 @@ proc require { args } { error "proc $fn returned a list of unexpected length $len" } - if {$required_val != !!$actual_val} { - if { [string length $msg] > 0 } { - unsupported "require failed: $arg ($msg)" - } else { - unsupported "require failed: $arg" - } + if {$required_val == !!$actual_val} { + continue + } - return -code return 0 + if { [string length $msg] > 0 } { + unsupported "require failed: $arg ($msg)" + } else { + unsupported "require failed: $arg" + } + + transparent_uplevel { + return 0 } } } base-commit: 1b4798a583207d0f65ada393ac43d2b81f422961 -- 2.51.0