From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 7/8] Add test case for empty TUI windows
Date: Sun, 21 Jul 2019 18:49:00 -0000 [thread overview]
Message-ID: <20190721184910.26679-8-tom@tromey.com> (raw)
In-Reply-To: <20190721184910.26679-1-tom@tromey.com>
My original intent here was to add a test case to test that empty TUI
windows re-render their contents after a resize. However, this seems
pretty broken at the moment, so a lot of the test is actually
disabled.
gdb/testsuite/ChangeLog
2019-07-21 Tom Tromey <tom@tromey.com>
* lib/tuiterm.exp (Term::clean_restart): Make "executable"
optional.
* gdb.tui/empty.exp: New file.
---
gdb/testsuite/ChangeLog | 6 ++
gdb/testsuite/gdb.tui/empty.exp | 108 ++++++++++++++++++++++++++++++++
gdb/testsuite/lib/tuiterm.exp | 11 +++-
3 files changed, 122 insertions(+), 3 deletions(-)
create mode 100644 gdb/testsuite/gdb.tui/empty.exp
diff --git a/gdb/testsuite/gdb.tui/empty.exp b/gdb/testsuite/gdb.tui/empty.exp
new file mode 100644
index 00000000000..e24ac58f718
--- /dev/null
+++ b/gdb/testsuite/gdb.tui/empty.exp
@@ -0,0 +1,108 @@
+# 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 with empty windows.
+
+load_lib "tuiterm.exp"
+
+standard_testfile
+
+Term::clean_restart 24 80
+
+if {![Term::enter_tui]} {
+ unsupported "TUI not supported"
+}
+
+# Each entry describes a layout. It has these items:
+# 1. Layout name
+# 2. Test name
+# 3. List of boxes in 80x24 mode
+# 4. List of boxes in 90x40 mode
+# 5. List of test name and text for the empty window
+set layouts {
+ {src src {{3 0 77 15}} {{3 0 87 23}}
+ {{"no source" "No Source Available"}}}
+ {regs src-regs {{0 0 80 8} {3 7 77 8}} {{0 0 90 13} {3 13 87 13}}
+ {
+ {"no source" "No Source Available"}
+ {"no regs" "Register Values Unavailable"}
+ }}
+ {asm asm {{3 0 77 15}} {{3 0 87 24}}
+ {"no asm" "No Assembly Available"}}
+ {regs asm-regs {{0 0 80 8} {3 7 77 9}} {{0 0 90 13} {3 13 87 14}}
+ {
+ {"no asm" "No Assembly Available"}
+ {"no regs" "Register Values Unavailable"}
+ }}
+ {split split {{3 0 77 8} {3 7 77 9}} {{3 0 87 14} {3 14 87 14}}
+ {
+ {"no source" "No Source Available"}
+ {"no asm" "No Assembly Available"}
+ }}
+ {regs split-regs {{0 0 80 8} {3 7 77 9}} {{0 0 90 13} {3 13 87 14}}
+ {
+ {"no asm" "No Assembly Available"}
+ {"no regs" "Register Values Unavailable"}
+ }}
+}
+
+# Helper function to verify a list of boxes.
+proc check_boxes {boxes} {
+ set boxno 1
+ foreach box $boxes {
+ if {$boxno > 1} {
+ # The upper-left corner of the second box may not render
+ # properly, due to overlap.
+ setup_xfail *-*-*
+ }
+ eval Term::check_box [list "box $boxno"] $box
+ incr boxno
+ }
+}
+
+# Helper function to verify text.
+proc check_text {text_list} {
+ set text [Term::get_all_lines]
+ foreach item $text_list {
+ lassign $item testname check
+ if {[string first $check $text]} {
+ pass $testname
+ } else {
+ fail $testname
+ }
+ }
+
+}
+
+foreach layout $layouts {
+ lassign $layout name testname small_boxes large_boxes text_list
+
+ with_test_prefix $testname {
+ Term::command "layout $name"
+ with_test_prefix 80x24 {
+ check_boxes $small_boxes
+ check_text $text_list
+ }
+
+ # FIXME: resizing is broken enough that we don't test it for
+ # now.
+ # Term::resize 40 90
+ # with_test_prefix 90x40 {
+ # check_boxes $large_boxes
+ # check_text $text_list
+ # }
+ # Term::resize 24 80
+ }
+}
diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index 3fc4fcb614a..e56e4a48952 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -392,13 +392,18 @@ namespace eval Term {
# Like ::clean_restart, but ensures that gdb starts in an
# environment where the TUI can work. ROWS and COLS are the size
- # of the terminal. EXECUTABLE is passed to clean_restart.
- proc clean_restart {rows cols executable} {
+ # of the terminal. EXECUTABLE, if given, is passed to
+ # clean_restart.
+ proc clean_restart {rows cols {executable {}}} {
global env stty_init
save_vars {env(TERM) stty_init} {
setenv TERM ansi
_setup $rows $cols
- ::clean_restart $executable
+ if {$executable == ""} {
+ ::clean_restart
+ } else {
+ ::clean_restart $executable
+ }
}
}
--
2.17.2
next prev parent reply other threads:[~2019-07-21 18:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-21 18:49 [PATCH 0/8] Testing for the TUI Tom Tromey
2019-07-21 18:49 ` [PATCH 4/8] Add TUI register window test Tom Tromey
2019-07-21 18:49 ` Tom Tromey [this message]
2019-07-21 18:49 ` [PATCH 8/8] Add test that "file" shows "main" Tom Tromey
2019-07-21 18:49 ` [PATCH 5/8] Add TUI test for "list" Tom Tromey
2019-07-21 18:49 ` [PATCH 3/8] Add "layout split" test Tom Tromey
2019-07-21 18:49 ` [PATCH 2/8] Add test for "layout asm" Tom Tromey
2019-07-26 11:11 ` Andrew Burgess
2019-07-26 18:50 ` Tom Tromey
2019-07-21 18:49 ` [PATCH 6/8] Add TUI resizing test Tom Tromey
2019-07-21 18:49 ` [PATCH 1/8] A virtual terminal for the test suite 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=20190721184910.26679-8-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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).