From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WKOxOV5GemimcxcAWB0awg (envelope-from ) for ; Fri, 18 Jul 2025 09:04:30 -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=t/bXH3u0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oIf+CjKF; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=t/bXH3u0; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oIf+CjKF; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E7E8E1E11C; Fri, 18 Jul 2025 09:04: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=-9.1 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,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 2B3CB1E089 for ; Fri, 18 Jul 2025 09:04:30 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B6744385F024 for ; Fri, 18 Jul 2025 13:04:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B6744385F024 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=t/bXH3u0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oIf+CjKF; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=t/bXH3u0; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oIf+CjKF 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 01B13385274E for ; Fri, 18 Jul 2025 13:02:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 01B13385274E 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 01B13385274E Authentication-Results: server2.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=1752843729; cv=none; b=opY/Hq3T1GTGAE9KSrKckwDh1St01U/vs6TK98Lq+QvDAO2+RoIMfrWWTjBjClkvRReD4vyhn4pfovI9V3XfjVEU6z+87yOENUWWcWNG7eF4UTd2I1kyA4evIBasPVWMMEmVTrXEl9MRglG12HBMLzzbSRkuyRT2avLnMTjYdPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1752843729; c=relaxed/simple; bh=k2mw8zHSrmmK+UdP8++zf0kdtXT9E0IkuFTIUiwL+Gc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=k6jWcbzZ2ety51moG9fsCVjIoSlafK2QNlZBm0P/NzlenWv8aQ69TfFZERpIaa8knALha1lfy6yETtbtVK2n1LfCnUDvZf3rItyyNoKDPaNqAoeqcxcIqiXNmXM7v29Ox7vNXxTB1kWRpwF/3aMn4cUF191niXYfb3Ee1YvXXdo= ARC-Authentication-Results: i=1; server2.sourceware.org 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 63F0D1F809 for ; Fri, 18 Jul 2025 13:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1752843716; 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=vGL1bZ2o0IUerJZ0oTAu2hbD/kIkPQN9MQ6UxdYdd5w=; b=t/bXH3u0vgd/WBZPVP7lprVvrX2aGncEYzl0JuH4d4RWhJO7OLYFNmr2wC0mkKBAFmsxw4 wo7V/dN1mNY+sWkZmpmvgxsH5VziJ8rCxU2zj3Sw0dypr5tmU+PIRnr9tRlxR5UBlNxTOf Nincebeuxnq5uru/tFpBHZ2l0gQOZ08= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1752843716; 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=vGL1bZ2o0IUerJZ0oTAu2hbD/kIkPQN9MQ6UxdYdd5w=; b=oIf+CjKFRpgYvPij3l9AnXhAKYV1GRKLck66reg/fw4FSw7h0qazw1ZWa0CqcwbgfabsHa m5S+HXt5UYqgYhBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="t/bXH3u0"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=oIf+CjKF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1752843716; 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=vGL1bZ2o0IUerJZ0oTAu2hbD/kIkPQN9MQ6UxdYdd5w=; b=t/bXH3u0vgd/WBZPVP7lprVvrX2aGncEYzl0JuH4d4RWhJO7OLYFNmr2wC0mkKBAFmsxw4 wo7V/dN1mNY+sWkZmpmvgxsH5VziJ8rCxU2zj3Sw0dypr5tmU+PIRnr9tRlxR5UBlNxTOf Nincebeuxnq5uru/tFpBHZ2l0gQOZ08= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1752843716; 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=vGL1bZ2o0IUerJZ0oTAu2hbD/kIkPQN9MQ6UxdYdd5w=; b=oIf+CjKFRpgYvPij3l9AnXhAKYV1GRKLck66reg/fw4FSw7h0qazw1ZWa0CqcwbgfabsHa m5S+HXt5UYqgYhBQ== 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 46A9D13AF1 for ; Fri, 18 Jul 2025 13:01: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 OHHYD8RFemjOHAAAD6G6ig (envelope-from ) for ; Fri, 18 Jul 2025 13:01:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 7/7] [gdb/testsuite] Add Term::get_string_with_attrs in tuiterm Date: Fri, 18 Jul 2025 15:01:53 +0200 Message-ID: <20250718130153.24989-8-tdevries@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250718130153.24989-1-tdevries@suse.de> References: <20250718130153.24989-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(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]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[gdb.tui:url,suse.de:mid,suse.de:dkim] X-Rspamd-Queue-Id: 63F0D1F809 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action 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 While reading a gdb.log for test-case gdb.tui/main-2.exp, I noticed that this line was somewhat hard to read: ... screen line 6: '|B+> 21 return 0; |' ... because of the border attributes. Then I realized that the test-case is only interested in the text between the borders, so I added a proc Term::get_string_with_attrs that allows me to drop the borders, getting us instead: ... screen line 6: 'B+> 21 return 0; ' ... Tested on aarch64-linux. --- gdb/testsuite/gdb.tui/main-2.exp | 2 +- gdb/testsuite/lib/tuiterm.exp | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.tui/main-2.exp b/gdb/testsuite/gdb.tui/main-2.exp index 2b0fb6bd003..71ad03b73fc 100644 --- a/gdb/testsuite/gdb.tui/main-2.exp +++ b/gdb/testsuite/gdb.tui/main-2.exp @@ -41,7 +41,7 @@ if {![Term::enter_tui]} { set line " return 0;" set nr [gdb_get_line_number $line] -set screen_line [Term::get_line_with_attrs 6] +set screen_line [Term::get_string_with_attrs 6 1 79] verbose -log "screen line 6: '$screen_line'" gdb_assert { [regexp "$nr $line" $screen_line] } \ "highlighted line in middle of source window" diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index 76351841988..d62cc0751a5 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -1012,10 +1012,10 @@ namespace eval Term { return $res } - # Return the text of screen line N. Lines are 0-based. If C is given, - # stop before column C. Columns are also zero-based. If ATTRS, annotate - # with attributes. - proc get_line_1 {n c attrs} { + # Return the text of screen line N. Lines are 0-based. Start at column + # X. If C is given, stop before column C. Columns are also zero-based. + # If ATTRS, annotate with attributes. + proc get_string {n x c {attrs 0}} { variable _rows # This can happen during resizing, if the cursor seems to # temporarily be off-screen. @@ -1027,7 +1027,6 @@ namespace eval Term { variable _cols variable _chars set c [_default $c $_cols] - set x 0 if { $attrs } { _reset_attrs line_attrs } @@ -1047,6 +1046,20 @@ namespace eval Term { return $result } + # Return the text of screen line N. Lines are 0-based. Start at column + # X. If C is given, stop before column C. Columns are also zero-based. + # Annotate with attributes. + proc get_string_with_attrs { n x c } { + return [get_string $n $x $c 1] + } + + # Return the text of screen line N. Lines are 0-based. If C is given, + # stop before column C. Columns are also zero-based. If ATTRS, annotate + # with attributes. + proc get_line_1 {n c attrs} { + return [get_string $n 0 $c $attrs] + } + # Return the text of screen line N, without attributes. Lines are # 0-based. If C is given, stop before column C. Columns are also # zero-based. -- 2.43.0