From patchwork Fri Jul 26 18:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33821 Received: (qmail 26353 invoked by alias); 26 Jul 2019 18:51:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 25973 invoked by uid 89); 26 Jul 2019 18:51:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=Assembly, boxes, corner X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.145.216) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 26 Jul 2019 18:51:40 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway33.websitewelcome.com (Postfix) with ESMTP id C242E387B6 for ; Fri, 26 Jul 2019 13:51:38 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id r5JahpZf0iQerr5JahFE8j; Fri, 26 Jul 2019 13:51:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=P+l1lLS54UElrTeUSubyW4HE0ZdXpQk4SKfOw/fQ73U=; b=ZhGCycBM5lLZpreBfLzF/bfFxT tcwBAMfflVo9cubD4hbI0UXBOscRtHwzb/NBMGdGi2Wm6foPUW8/9blZoTOnftN6vnvm7wMvs3Lu6 kTTl3Wu2aMcgesVKkR86lbD4V; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:48912 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hr5Ja-002aT1-I4; Fri, 26 Jul 2019 13:51:38 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 7/8] Add test case for empty TUI windows Date: Fri, 26 Jul 2019 12:51:33 -0600 Message-Id: <20190726185134.1856-8-tom@tromey.com> In-Reply-To: <20190726185134.1856-1-tom@tromey.com> References: <20190726185134.1856-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. 2019-07-21 Tom Tromey * 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 | 103 ++++++++++++++++++++++++++++++++ gdb/testsuite/lib/tuiterm.exp | 11 +++- 3 files changed, 117 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..90e26b3316e --- /dev/null +++ b/gdb/testsuite/gdb.tui/empty.exp @@ -0,0 +1,103 @@ +# 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 . + +# 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 + gdb_assert {[string first $check $text]} $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 + } } }