From patchwork Sun Jul 21 18:49:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33754 Received: (qmail 97057 invoked by alias); 21 Jul 2019 18:49:22 -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 96776 invoked by uid 89); 21 Jul 2019 18:49:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.3 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, RCVD_IN_SEMBLACK, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=hide X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.145.190) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 21 Jul 2019 18:49:18 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway33.websitewelcome.com (Postfix) with ESMTP id D5AB22E1D8 for ; Sun, 21 Jul 2019 13:49:16 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id pGtYhjDvN4FKppGtYhuYN8; Sun, 21 Jul 2019 13:49:16 -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=unPi3e1LFRVpn1EIpdHuqOsVAmpVR/ozc32qJQpeuzY=; b=LgrUoWkC3sYtHh17LDUlDPxphe 4YJpmmZGct48kKdANtD6umeON2c4ydzGsAVSU4BFUnXPTUELknwKhPpJKodu/3p77Mgl9waHEyscv doY5m6BOBihl3GEBgYplH0SkV; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:58458 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hpGtY-002hWd-LA; Sun, 21 Jul 2019 13:49:16 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 6/8] Add TUI resizing test Date: Sun, 21 Jul 2019 12:49:08 -0600 Message-Id: <20190721184910.26679-7-tom@tromey.com> In-Reply-To: <20190721184910.26679-1-tom@tromey.com> References: <20190721184910.26679-1-tom@tromey.com> This adds a test case that resizes the terminal and then checks that the TUI updates properly. gdb/testsuite/ChangeLog 2019-07-21 Tom Tromey * 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 | 48 ++++++++++++++++++++++++++++++++ gdb/testsuite/lib/tuiterm.exp | 45 ++++++++++++++++++++++++++++++ 3 files changed, 99 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..675fce8ab0c --- /dev/null +++ b/gdb/testsuite/gdb.tui/resize.exp @@ -0,0 +1,48 @@ +# 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. + +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 {[regexp ">|21 *return 0" $text]} { + pass "source at startup" +} else { + Term::dump_screen + fail "source at startup" +} + +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 + } }