From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 6B4E43858D38 for ; Tue, 13 Jun 2023 10:24:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6B4E43858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A41062199F for ; Tue, 13 Jun 2023 10:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686651854; 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=fAwOHe/TMDJdlGnSXu+8LyHjlnXiDPsm51uc5a4nQ3I=; b=MhQEbU4DSVm+4RvntyxhMnoodurqnr/QqEyuSTtwbgx1YroLStdw6LbeJ3rXR6LDvSsaTz HXohroG7LmZggNoQJBRdItvLxmsY4fuTzAwT2Kg6bdadJFxpWE8Z8MAbKeDjQJQrIMPtqC NzlsBNSPbDwq7xGUux3sSBIJQzkdRl0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686651854; 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=fAwOHe/TMDJdlGnSXu+8LyHjlnXiDPsm51uc5a4nQ3I=; b=lI3YU7MKmnwQvEaBltF20jbQYpZnL00Ro5xiEDMJMm1hwrL4ZHNJfDEjwARkYChGhbqNJZ hUN5pZwG3OV9RaAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9249613345 for ; Tue, 13 Jun 2023 10:24:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 9rCvIs5DiGQncQAAMHmgww (envelope-from ) for ; Tue, 13 Jun 2023 10:24:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 1/2] [gdb/testsuite] Allow procs with default value args in with_override Date: Tue, 13 Jun 2023 12:24:32 +0200 Message-Id: <20230613102433.13601-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Currently proc with_override does not work with procs with default value args. Fix this, and add a test-case excercising this scenario. Tested on x86_64-linux. --- gdb/testsuite/gdb.testsuite/with-override.exp | 81 +++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 20 ++++- 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.testsuite/with-override.exp diff --git a/gdb/testsuite/gdb.testsuite/with-override.exp b/gdb/testsuite/gdb.testsuite/with-override.exp new file mode 100644 index 00000000000..dbd0064ffb0 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/with-override.exp @@ -0,0 +1,81 @@ +# Copyright 2023 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check with_override proc. + +proc foo {} { + return 0 +} + +proc foo1 {} { + return 1 +} + +proc foo2 {} { + return 2 +} + +with_test_prefix no-args { + + with_test_prefix before { + gdb_assert { [foo] == 0 } + } + + with_override foo foo1 { + with_test_prefix foo1 { + gdb_assert { [foo] == 1 } + } + + with_override foo foo2 { + with_test_prefix foo2 { + gdb_assert { [foo] == 2 } + } + } + } + + with_test_prefix after { + gdb_assert { [foo] == 0 } + } +} + +proc foo { {a 0} } { + return [expr $a + 1] +} + +proc foo_plus_1 { {a 0} } { + return [expr $a + 2] +} + +with_test_prefix default-arg { + + with_test_prefix before { + gdb_assert { [foo] == 1 } + gdb_assert { [foo 0] == 1 } + gdb_assert { [foo 1] == 2 } + } + + with_override foo foo_plus_1 { + with_test_prefix foo_plus_1 { + gdb_assert { [foo] == 2 } + gdb_assert { [foo 0] == 2 } + gdb_assert { [foo 1] == 3 } + } + } + + with_test_prefix after { + gdb_assert { [foo] == 1 } + gdb_assert { [foo 0] == 1 } + gdb_assert { [foo 1] == 2 } + } +} diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index c3e5d4891dc..f214a6bb54d 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9062,6 +9062,22 @@ proc hex_in_list { val hexlist } { return [expr $index != -1] } +# As info args, but also add the default values. + +proc info_args_with_defaults { name } { + set args {} + + foreach arg [info args $name] { + if { [info default $name $arg default_value] } { + lappend args [list $arg $default_value] + } else { + lappend args $arg + } + } + + return $args +} + # Override proc NAME to proc OVERRIDE for the duration of the execution of # BODY. @@ -9081,7 +9097,7 @@ proc with_override { name override body } { # Save the old proc, if it exists. if { [info procs $name] != "" } { - set old_args [info args $name] + set old_args [info_args_with_defaults $name] set old_body [info body $name] set existed true } else { @@ -9089,7 +9105,7 @@ proc with_override { name override body } { } # Install the override. - set new_args [info args $override] + set new_args [info_args_with_defaults $override] set new_body [info body $override] eval proc $name {$new_args} {$new_body} base-commit: 40bea10383b36fbe451d91ed0513792c399de1a6 -- 2.35.3