From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 902D83858C20 for ; Thu, 8 Jun 2023 22:13:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 902D83858C20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C2A5521A04 for ; Thu, 8 Jun 2023 22:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686262387; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Jb12/WOuvIAqVPa6xh2p7qJdZNTCLanz2r2tMqxXlZ0=; b=uoblRTJjlgtrJbkCCQMuHuSX4EltbJNjC8eHe/72uaXz7/8AR+RH/DQqOPJHYjilnhAxrB dxqr5K+zLfcDxtPLasXBmVCYBLbzdZiJ2K7sJOWB0lexKe2EFCpkCTnQj39o5sqAQ73XOW 5zsEWOg/vjkabF/zoMldxV6l4r6HM5M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686262387; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Jb12/WOuvIAqVPa6xh2p7qJdZNTCLanz2r2tMqxXlZ0=; b=beFzUqMdN57JdM6K0dRTCs6BpwJYSN2Y6EuLjAoZRv2GDuhLeyNz3aXM04keH3gz8d6mCI +J+HweK4dIli/PCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B01D413480 for ; Thu, 8 Jun 2023 22:13:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Z6/RKXNSgmSZMAAAMHmgww (envelope-from ) for ; Thu, 08 Jun 2023 22:13:07 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Add test-case gdb.tui/long-prompt.exp Date: Fri, 9 Jun 2023 00:13:16 +0200 Message-Id: <20230608221316.12705-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_LOTSOFHASH,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: I noticed that the test-suite doesn't excercise the case in tui_redisplay_readline that height (initially 1) is changed by this call: ... tui_puts_internal (w, prompt, &height); ... Add a test-case that excercises this. Tested on x86_64-linux. --- gdb/testsuite/gdb.tui/long-prompt.exp | 158 ++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 gdb/testsuite/gdb.tui/long-prompt.exp diff --git a/gdb/testsuite/gdb.tui/long-prompt.exp b/gdb/testsuite/gdb.tui/long-prompt.exp new file mode 100644 index 00000000000..e7249bbfea3 --- /dev/null +++ b/gdb/testsuite/gdb.tui/long-prompt.exp @@ -0,0 +1,158 @@ +# Copyright 2023 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 a prompt one less than, equal to, and one more than screen width in +# TUI. + +require allow_tui_tests + +tuiterm_env + +with_test_prefix "prompt size == width + 1" { + Term::clean_restart 24 40 + + if {![Term::enter_tui]} { + unsupported "TUI not supported" + return + } + + set prompt "123456789A123456789B123456789C123456789D>" + + # Set new prompt, and set old prompt back. + send_gdb "set prompt $prompt\n" + send_gdb "set prompt (gdb) \n" + + # Expected output: + # + # 16 (gdb) set prompt 123456789A123456789B123 + # 17 456789C123456789D> + # 18 123456789A123456789B123456789C123456789D + # 19 >set prompt (gdb) + # 20 (gdb) + + gdb_assert { [Term::wait_for "^>set prompt $gdb_prompt "] } \ + "got prompt back" + + gdb_assert { $Term::_cur_row == 20 } +} + +with_test_prefix "prompt size == width + 1: end of screen" { + Term::clean_restart 24 40 + + if {![Term::enter_tui]} { + unsupported "TUI not supported" + return + } + + # Put prompt at last line. + Term::command "echo \\n" + Term::command "echo \\n" + Term::command "echo \\n" + Term::command "echo \\n" + gdb_assert { $Term::_cur_row == 23 } "at last line" + + set prompt "123456789A123456789B123456789C123456789D>" + + # Set new prompt, and set old prompt back. + send_gdb "set prompt $prompt\n" + send_gdb "set prompt (gdb) \n" + + # Expected output: + # + # 19 (gdb) set prompt 123456789A123456789B123 + # 20 456789C123456789D> + # 21 123456789A123456789B123456789C123456789D + # 22 >set prompt (gdb) + # 23 (gdb) + + gdb_assert { [Term::wait_for "^>set prompt $gdb_prompt "] } \ + "got prompt back" + + gdb_assert { $Term::_cur_row == 23 } "still at last line" + Term::check_region_contents "scrolling" 0 19 40 1 \ + "^$gdb_prompt set prompt 123456789A123456789B123$" +} + +with_test_prefix "prompt size == width" { + Term::clean_restart 24 40 + + if {![Term::enter_tui]} { + unsupported "TUI not supported" + return + } + + set prompt "123456789A123456789B123456789C123456789>" + + # Set new prompt, and set old prompt back. + send_gdb "set prompt $prompt\n" + send_gdb "set prompt (gdb) \n" + + # Expected output: + # + # 16 (gdb) set prompt 123456789A123456789B123 + # 17 456789C123456789> + # 18 123456789A123456789B123456789C123456789> + # 19 + # 20 123456789A123456789B123456789C123456789> + # 21 set prompt (gdb) + # 22 (gdb) + # + # Note that it would be nice to get instead: + # + # 16 (gdb) set prompt 123456789A123456789B123 + # 17 456789C123456789> + # 18 123456789A123456789B123456789C123456789> + # 19 set prompt (gdb) + # 20 (gdb) + # + # The extra newline is added by rl_on_new_line_with_prompt, which decides + # this as follows: + # /* If the prompt length is a multiple of real_screenwidth, we don't know + # whether the cursor is at the end of the last line, or already at the + # beginning of the next line. Output a newline just to be safe. */ + + gdb_assert { [Term::wait_for "^set prompt $gdb_prompt "] } \ + "got prompt back" + + gdb_assert { $Term::_cur_row == 22 } +} + +with_test_prefix "prompt size == width - 1" { + Term::clean_restart 24 40 + + if {![Term::enter_tui]} { + unsupported "TUI not supported" + return + } + + set prompt "123456789A123456789B123456789C12345678>" + + # Set new prompt, and set old prompt back. + send_gdb "set prompt $prompt\n" + send_gdb "set prompt (gdb) \n" + + # Expected output: + # + # 16 (gdb) set prompt 123456789A123456789B123 + # 17 456789C12345678> + # 18 123456789A123456789B123456789C12345678>s + # 19 et prompt (gdb) + # 20 (gdb) + + gdb_assert { [Term::wait_for "^et prompt $gdb_prompt "] } \ + "got prompt back" + + gdb_assert { $Term::_cur_row == 20 } +} base-commit: ea70f941f9b2ccb0bbcda62496426e060da946a7 -- 2.35.3