Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 3/7] [gdb/testsuite] Log on return in Term::_log_cur
Date: Fri, 18 Jul 2025 15:01:49 +0200	[thread overview]
Message-ID: <20250718130153.24989-4-tdevries@suse.de> (raw)
In-Reply-To: <20250718130153.24989-1-tdevries@suse.de>

Proc Term::_log_cur logs the cursor update of code in its body argument:
...
    proc _ctl_0x08 {} {
        _log_cur "Backspace" {
            variable _cur_col

            if {$_cur_col > 0} {
                incr _cur_col -1
            }
        }
    }
...
giving us for instance:
...
+++ Backspace, cursor: (2, 0) -> (2, 0)
...

But if we rewrite the code to use a return:
...
	    if { $_cur_col == 0 } {
		return
	    }
	    incr _cur_col -1
...
and the return is triggered, the log message disappears.

Fix this by wrapping the "uplevel $body" in a catch:
...
-	uplevel $body
+	set code [catch {uplevel $body} result]
...

Tested on aarch64-linux.
---
 gdb/testsuite/lib/tuiterm.exp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index 2268b1e28e0..4364ff8d05c 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -45,9 +45,16 @@ namespace eval Term {
 	set orig_cur_row $_cur_row
 	set orig_cur_col $_cur_col
 
-	uplevel $body
+	set code [catch {uplevel $body} result]
 
 	_log "$what, cursor: ($orig_cur_row, $orig_cur_col) -> ($_cur_row, $_cur_col)"
+
+	if { $code == 1 } {
+	    global errorInfo errorCode
+	    return -code $code -errorinfo $errorInfo -errorcode $errorCode $result
+	} else {
+	    return -code $code $result
+	}
     }
 
     # If ARG is empty, return DEF: otherwise ARG.  This is useful for
-- 
2.43.0


  parent reply	other threads:[~2025-07-18 13:02 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-18 13:01 [PATCH 0/7] [gdb/testsuite] Fix TUI tests for freebsd Tom de Vries
2025-07-18 13:01 ` [PATCH 1/7] [gdb/testsuite] Fix Cursor Horizontal Absolute clipping Tom de Vries
2025-07-18 13:01 ` [PATCH 2/7] [gdb/testsuite] Handle Horizontal Position Absolute in tuiterm Tom de Vries
2025-07-18 13:01 ` Tom de Vries [this message]
2025-07-23 18:28   ` [PATCH 3/7] [gdb/testsuite] Log on return in Term::_log_cur Tom Tromey
2025-07-24  7:18     ` Tom de Vries
2025-07-18 13:01 ` [PATCH 4/7] [gdb/testsuite] Handle auto_left_margin in tuiterm Tom de Vries
2025-07-23 18:36   ` Tom Tromey
2025-07-18 13:01 ` [PATCH 5/7] [gdb/testsuite] Fix Term::_csi_m with no args Tom de Vries
2025-07-23 18:30   ` Tom Tromey
2025-07-23 20:34     ` Tom de Vries
2025-07-24  1:17       ` Tom Tromey
2025-07-18 13:01 ` [PATCH 6/7] [gdb/testsuite] Use TERM=ansiw in tuiterm for bsd Tom de Vries
2025-07-23 18:34   ` Tom Tromey
2025-07-24  9:47     ` Tom de Vries
2025-07-18 13:01 ` [PATCH 7/7] [gdb/testsuite] Add Term::get_string_with_attrs in tuiterm Tom de Vries
2025-07-23 18:36   ` Tom Tromey
2025-07-24 10:07     ` Tom de Vries

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250718130153.24989-4-tdevries@suse.de \
    --to=tdevries@suse.de \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox