From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 6/8] Add TUI resizing test
Date: Fri, 26 Jul 2019 18:51:00 -0000 [thread overview]
Message-ID: <20190726185134.1856-7-tom@tromey.com> (raw)
In-Reply-To: <20190726185134.1856-1-tom@tromey.com>
This adds a test case that resizes the terminal and then checks that
the TUI updates properly.
2019-07-21 Tom Tromey <tom@tromey.com>
* lib/tuiterm.exp (spawn): New proc.
(Term::resize): New proc.
* gdb.tui/resize.exp: New file.
---
gdb/testsuite/ChangeLog | 6 +++++
gdb/testsuite/gdb.tui/resize.exp | 45 ++++++++++++++++++++++++++++++++
gdb/testsuite/lib/tuiterm.exp | 45 ++++++++++++++++++++++++++++++++
3 files changed, 96 insertions(+)
create mode 100644 gdb/testsuite/gdb.tui/resize.exp
diff --git a/gdb/testsuite/gdb.tui/resize.exp b/gdb/testsuite/gdb.tui/resize.exp
new file mode 100644
index 00000000000..faa9b6f6f56
--- /dev/null
+++ b/gdb/testsuite/gdb.tui/resize.exp
@@ -0,0 +1,45 @@
+# Copyright 2019 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 <http://www.gnu.org/licenses/>.
+
+# Test TUI resizing.
+
+load_lib "tuiterm.exp"
+
+standard_testfile tui-layout.c
+
+if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
+ return -1
+}
+
+Term::clean_restart 24 80 $testfile
+
+if {![runto_main]} {
+ perror "test suppressed"
+ return
+}
+
+if {![Term::enter_tui]} {
+ unsupported "TUI not supported"
+}
+
+set text [Term::get_all_lines]
+if {![gdb_assert {[regexp ">|21 *return 0" $text]} "source at startup"]} {
+ Term::dump_screen
+}
+
+Term::resize 40 90
+# Resizing seems to be somewhat broken.
+setup_xfail *-*-*
+Term::check_box "source box after resize" 0 0 90 23
diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index 2b0af86c48c..3fc4fcb614a 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -15,6 +15,19 @@
# An ANSI terminal emulator for expect.
+# The expect "spawn" function puts the tty name into the spawn_out
+# array; but dejagnu doesn't export this globally. So, we have to
+# wrap spawn with our own function, so that we can capture this value.
+# The value is later used in calls to stty.
+rename spawn builtin_spawn
+proc spawn {args} {
+ set result [uplevel builtin_spawn $args]
+ global gdb_spawn_name
+ upvar spawn_out spawn_out
+ set gdb_spawn_name $spawn_out(slave,name)
+ return $result
+}
+
namespace eval Term {
variable _rows
variable _cols
@@ -514,4 +527,36 @@ namespace eval Term {
verbose "$fmt [get_line $y]"
}
}
+
+ # Resize the terminal.
+ proc resize {rows cols} {
+ variable _chars
+ variable _rows
+ variable _cols
+
+ set old_rows [expr {min ($_rows, $rows)}]
+ set old_cols [expr {min ($_cols, $cols)}]
+
+ # Copy locally.
+ array set local_chars [array get _chars]
+ unset _chars
+
+ set _rows $rows
+ set _cols $cols
+ _clear_lines 0 $_rows
+
+ for {set x 0} {$x < $old_cols} {incr x} {
+ for {set y 0} {$y < $old_rows} {incr y} {
+ set _chars($x,$y) $local_chars($x,$y)
+ }
+ }
+
+ global gdb_spawn_name
+ # 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.
+ stty rows $_rows columns [expr {$_cols + 1}] \
+ < $gdb_spawn_name
+ _accept
+ }
}
--
2.17.2
next prev parent reply other threads:[~2019-07-26 18:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 18:51 [PATCH v2 0/8] TUI testing Tom Tromey
2019-07-26 18:51 ` [PATCH v2 8/8] Add test that "file" shows "main" Tom Tromey
2019-07-26 18:51 ` [PATCH v2 7/8] Add test case for empty TUI windows Tom Tromey
2019-07-26 18:51 ` [PATCH v2 5/8] Add TUI test for "list" Tom Tromey
2019-07-26 18:51 ` [PATCH v2 4/8] Add TUI register window test Tom Tromey
2019-07-26 18:51 ` [PATCH v2 1/8] A virtual terminal for the test suite Tom Tromey
2019-07-27 16:01 ` Andrew Burgess
2019-07-28 2:56 ` Tom Tromey
2019-07-31 15:44 ` minimal tcl version for gdb " Tom de Vries
2019-07-31 17:46 ` Tom Tromey
2019-08-01 9:39 ` Tom de Vries
2019-08-01 15:48 ` Tom Tromey
2019-07-26 18:51 ` [PATCH v2 3/8] Add "layout split" test Tom Tromey
2019-07-26 18:51 ` Tom Tromey [this message]
2019-07-26 18:51 ` [PATCH v2 2/8] Add test for "layout asm" Tom Tromey
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=20190726185134.1856-7-tom@tromey.com \
--to=tom@tromey.com \
--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