From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 42CXCKfvs2p/+zcAWB0awg (envelope-from ) for ; Wed, 23 Sep 2026 11:26:31 -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=Kgcuhbf4; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yMiCFDRQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Ecp/be4G; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=uLAn7nqy; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id EF6DF1E01F; Wed, 23 Sep 2026 11:26:30 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.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,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED 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 91B4B1E01F for ; Wed, 23 Sep 2026 11:26:29 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4FDD44BB3BA4 for ; Wed, 23 Sep 2026 15:26:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4FDD44BB3BA4 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=Kgcuhbf4; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yMiCFDRQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Ecp/be4G; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=uLAn7nqy Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 3690E4BB1C1B for ; Wed, 23 Sep 2026 15:26:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3690E4BB1C1B 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 3690E4BB1C1B Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790177163; cv=none; b=JVfnJjXZ4pZVVXxa8MFzFh9+/9hnDV6z1T+UhI314Jw97ym7g2VajwcfJGyNw0hA7kkbCjxG2C+0vJX8aqa5ijBtY5P1hB+z0k3fzw67YhlNcEvt7npfe4usER2rZkeYdcz9M3jXwuYWDB3JUyKczghGjMV33BdGCv4sbEUzToU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790177163; c=relaxed/simple; bh=IpAz1NcAx2P9OKMAVRJ7NMnTLdIbrEMU9zE7KSXugBQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=gMctRW0VF8JNDhDlFyttgMbU36RtcneAWapSDGTQLUxnMUR2DYtv4/4UkZuuTy6m57lQgfMn/s+njr4BNgqZEqRPEZXYYaJrvmBv69VXHwovQFt8fu28xFfz30DldJIF+FAunqOpK7MyO/qDzTm70WqAi/0NtYTzMP7591WaDaI= 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=Kgcuhbf4; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yMiCFDRQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Ecp/be4G; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=uLAn7nqy DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3690E4BB1C1B 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-out2.suse.de (Postfix) with ESMTPS id CDCB11FFBB for ; Wed, 23 Sep 2026 15:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790177158; 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=5ZpHOllKr91B47qURGkTXZprS2C74/xpy/HfaqAeYw0=; b=Kgcuhbf4ChhZbxBRapQAh82i+kKeE1hrZ6YQAcJ73xhMSjTo3WWl9ijDklI0tHJSt0lVt3 GRoewdb9brcwTATpUeiXGagyiKPwiovSTiR43OHdOk+jEH5M7lZxiCtP9CAgkPdWE/hWeu ja78hgs1CpXgrQD0GzJrtLBG9NdFwPQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790177158; 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=5ZpHOllKr91B47qURGkTXZprS2C74/xpy/HfaqAeYw0=; b=yMiCFDRQRJQMBYtc9q4YI79R7kPDGZu+f4+ASKL1BBFOtKCAnggRNVx6fqkPvHyequR+it NoVM/yFP+W7ygFAA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="Ecp/be4G"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=uLAn7nqy DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790177153; 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=5ZpHOllKr91B47qURGkTXZprS2C74/xpy/HfaqAeYw0=; b=Ecp/be4Gcp6XuUCLV8XMs4ascmbxpYcsl/oa8WeinVlGwYYs/Cv3p4fE/mPKegkTIIUeD3 a73UY5NrYAoPXemVtr6/K0R7Ox9p3b00aNoH9MGKfpvccdcBrnXU1GVYN6VO8pqp/o2hBQ m520dvYmcumOZM+RrGozoojTimALQ5A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790177153; 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=5ZpHOllKr91B47qURGkTXZprS2C74/xpy/HfaqAeYw0=; b=uLAn7nqyQ9Ncs9Mq2nluRtCdv9kf3rlViiMbyj4/J7FLrYZqzhylnfZAAdup/1Wu0185YY araeAEmgP102uxAg== 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 97CAB134E8 for ; Wed, 23 Sep 2026 15:25:53 +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 oFb1GoHvs2odKQAAD6G6ig (envelope-from ) for ; Wed, 23 Sep 2026 15:25:53 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Factor out unproc Date: Wed, 23 Sep 2026 17:25:53 +0200 Message-ID: <20260923152553.382981-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CDCB11FFBB X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action 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)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; URIBL_BLOCKED(0.00)[suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid]; TO_DN_NONE(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] 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 I noticed in gdb.rocm/hcc-amdgpu-targets.exp: ... rename find_amdgpu_devices {} ... This deletes the proc find_amdgpu_devices. Unlike something like unset, it's not obvious what this does. Fix this by: - factoring out the rename into a new proc unproc, named using the set/unset pattern, and - adding a comment in unproc explaining what the effect of a rename to empty string is. Apply it using: ... $ find gdb/testsuite -type f -name *.exp* \ | xargs sed -i 's/rename \(.*\) {}/unproc \1/' ... and likewise for "". Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/scm-parameter.exp | 2 +- gdb/testsuite/gdb.python/py-parameter.exp | 2 +- gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp | 2 +- gdb/testsuite/lib/dwarf.exp | 4 ++-- gdb/testsuite/lib/future.exp | 16 ++++++++-------- gdb/testsuite/lib/gdb.exp | 10 ++++++++-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp index 123f45dbb49..c659ac2752b 100644 --- a/gdb/testsuite/gdb.guile/scm-parameter.exp +++ b/gdb/testsuite/gdb.guile/scm-parameter.exp @@ -562,7 +562,7 @@ with_test_prefix "set/show parameter" { gdb_test "show test-prefix-2" "^invoke -- show" } -rename scm_param_test_maybe_no_output "" +unproc scm_param_test_maybe_no_output # Test a color parameter. diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp index b606b13b4ec..2a7a9b13fb6 100644 --- a/gdb/testsuite/gdb.python/py-parameter.exp +++ b/gdb/testsuite/gdb.python/py-parameter.exp @@ -912,4 +912,4 @@ test_ambiguous_parameter test_unknown_prefix test_set_show_parameters -rename py_param_test_maybe_no_output "" +unproc py_param_test_maybe_no_output diff --git a/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp b/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp index 8f04cca7981..690ecb8af32 100644 --- a/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp +++ b/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp @@ -28,7 +28,7 @@ proc with_stub_devices {devices body} { # tclint-disable-next-line command-args proc find_amdgpu_devices {} [list return $devices] set code [catch {uplevel 1 $body} result] - rename find_amdgpu_devices {} + unproc find_amdgpu_devices rename __saved_find_amdgpu_devices find_amdgpu_devices return -code $code $result } diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 839c5174265..b37d63b868f 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -3060,8 +3060,8 @@ namespace eval Dwarf { variable _level uplevel $_level $body - rename include_dir "" - rename file_name "" + unproc include_dir + unproc file_name _line_finalize_header diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp index fbe517f116b..44fc17b3f00 100644 --- a/gdb/testsuite/lib/future.exp +++ b/gdb/testsuite/lib/future.exp @@ -705,7 +705,7 @@ if {[info procs find_gnatmake] == ""} { set use_gdb_compile(ada) 1 gdb_note [join [list $note_prefix "Ada" $note_suffix] ""] } else { - rename gdb_find_gnatmake "" + unproc gdb_find_gnatmake } if {[info procs find_gfortran] == ""} { @@ -713,7 +713,7 @@ if {[info procs find_gfortran] == ""} { set use_gdb_compile(fortran) 1 gdb_note [join [list $note_prefix "Fortran" $note_suffix] ""] } else { - rename gdb_find_gfortran "" + unproc gdb_find_gfortran } if {[info procs find_go_linker] == ""} { @@ -722,8 +722,8 @@ if {[info procs find_go_linker] == ""} { set use_gdb_compile(go) 1 gdb_note [join [list $note_prefix "Go" $note_suffix] ""] } else { - rename gdb_find_go "" - rename gdb_find_go_linker "" + unproc gdb_find_go + unproc gdb_find_go_linker } if {[info procs find_gdc] == ""} { @@ -731,7 +731,7 @@ if {[info procs find_gdc] == ""} { set use_gdb_compile(d) 1 gdb_note [join [list $note_prefix "D" $note_suffix] ""] } else { - rename gdb_find_gdc "" + unproc gdb_find_gdc } if {[info procs find_rustc] == ""} { @@ -739,7 +739,7 @@ if {[info procs find_rustc] == ""} { set use_gdb_compile(rust) 1 gdb_note [join [list $note_prefix "Rust" $note_suffix] ""] } else { - rename gdb_find_rustc "" + unproc gdb_find_rustc } if {[info procs find_hip_compiler] == ""} { @@ -747,7 +747,7 @@ if {[info procs find_hip_compiler] == ""} { set use_gdb_compile(hip) 1 gdb_note [join [list $note_prefix "HIP" $note_suffix] ""] } else { - rename gdb_find_hip_compiler "" + unproc gdb_find_hip_compiler } # If dejagnu's default_target_compile is missing support for any language, @@ -756,7 +756,7 @@ if { [array size use_gdb_compile] != 0 } { catch {rename default_target_compile dejagnu_default_target_compile} rename gdb_default_target_compile default_target_compile } else { - rename gdb_default_target_compile "" + unproc gdb_default_target_compile } # Various ccache versions provide incorrect debug info such as ignoring diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1ebdaf6ba10..58753e721fd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8930,7 +8930,7 @@ proc gdb_finish { } { if { [info procs ::gdb_tcl_unknown] != "" } { # Restore dejagnu's version of proc unknown. - rename ::unknown "" + unproc ::unknown rename ::dejagnu_unknown ::unknown } @@ -11351,7 +11351,7 @@ proc with_override { name override body } { # tclint-disable-next-line command-args proc $name $old_args $old_body } else { - rename $name "" + unproc $name } # Return as appropriate. @@ -12466,6 +12466,12 @@ proc unprintable_to_octal { input_string } { # Ignore args and don't do anything. Can be used with proc with_override. proc nop {args} {} +# Delete proc P. +proc unproc {p} { + # Renaming to an empty string deletes proc P. + uplevel 1 [list rename $p {}] +} + require {tcl_version_at_least 8 6 2} # Always load compatibility stuff. base-commit: 441953ac9d0b2902be92906817c68feadccd190f -- 2.51.0