aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/lib
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-12-22 16:52:56 -0700
committerAndrew Burgess <andrew.burgess@embecosm.com>2020-01-09 23:11:46 +0000
commit9ae6bf640dc7c950e6f36097a3d2d760a132a542 (patch)
tree56debc86e8389a30050d484139d13ddb6024240c /gdb/testsuite/lib
parentb2efe70cf34e2f3ada8d0def69e53f27a6b71578 (diff)
downloadgdb-9ae6bf640dc7c950e6f36097a3d2d760a132a542.zip
gdb-9ae6bf640dc7c950e6f36097a3d2d760a132a542.tar.gz
gdb-9ae6bf640dc7c950e6f36097a3d2d760a132a542.tar.bz2
gdb: Fix scrolling in TUI
Hannes Domani pointed out that my previous patch to fix the "list" command in the TUI instead broke vertical scrolling. While looking at this, I found that do_scroll_vertical calls print_source_lines, which seems like a very roundabout way to change the source window. This patch removes this oddity and fixes the bug at the same time. I've added a new test case. This is somewhat tricky, because the obvious approach of sending a dummy command after the scroll did not work -- due to how the TUI works, sennding a command causes the scroll to take effect. gdb/ChangeLog 2019-12-22 Tom Tromey <tom@tromey.com> PR tui/18932: * tui/tui-source.c (tui_source_window::do_scroll_vertical): Call update_source_window, not print_source_lines. gdb/testsuite/ChangeLog 2019-12-22 Tom Tromey <tom@tromey.com> PR tui/18932: * lib/tuiterm.exp (Term::wait_for): Rename from _accept. Return a meangingful value. (Term::command, Term::resize): Update. * gdb.tui/basic.exp: Add scrolling test. Change-Id: I9636a7c8a8cade37431c6165ee996a9d556ef1c8
Diffstat (limited to 'gdb/testsuite/lib')
-rw-r--r--gdb/testsuite/lib/tuiterm.exp16
1 files changed, 10 insertions, 6 deletions
diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index 0307745..7adaf1b 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -388,8 +388,10 @@ namespace eval Term {
_clear_lines 0 $_rows
}
- # Accept some output from gdb and update the screen.
- proc _accept {wait_for} {
+ # Accept some output from gdb and update the screen. WAIT_FOR is
+ # a regexp matching the line to wait for. Return 0 on timeout, 1
+ # on success.
+ proc wait_for {wait_for} {
global expect_out
global gdb_prompt
variable _cur_x
@@ -424,7 +426,7 @@ namespace eval Term {
timeout {
# Assume a timeout means we somehow missed the
# expected result, and carry on.
- return
+ return 0
}
}
@@ -443,6 +445,8 @@ namespace eval Term {
set wait_for $prompt_wait_for
}
}
+
+ return 1
}
# Like ::clean_restart, but ensures that gdb starts in an
@@ -490,7 +494,7 @@ namespace eval Term {
# be supplied by this function.
proc command {cmd} {
send_gdb "$cmd\n"
- _accept [string_to_regexp $cmd]
+ wait_for [string_to_regexp $cmd]
}
# Return the text of screen line N, without attributes. Lines are
@@ -682,14 +686,14 @@ namespace eval Term {
# Due to the strange column resizing behavior, and because we
# don't care about this intermediate resize, we don't check
# the size here.
- _accept "@@ resize done $_resize_count"
+ wait_for "@@ resize done $_resize_count"
incr _resize_count
# Somehow the number of columns transmitted to gdb is one less
# than what we request from expect. We hide this weird
# details from the caller.
_do_resize $_rows $cols
stty columns [expr {$_cols + 1}] < $gdb_spawn_name
- _accept "@@ resize done $_resize_count, size = ${_cols}x${rows}"
+ wait_for "@@ resize done $_resize_count, size = ${_cols}x${rows}"
incr _resize_count
}
}