From patchwork Thu May 18 06:10:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 69567 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F06053857735 for ; Thu, 18 May 2023 06:11:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F06053857735 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684390276; bh=aMOb4tsVq0bVnILlyY3beV4M741WFvsw6tWADMbamgk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=PcUZ/sZKXf6hYQ+YRHopFg+KBCtyQGEpbJv/8TBZtNZU1D3EUPeWHgT0sW7ZO3ZIq xbbHNCxOirT3OHAQwdSRPV44P9k92Th5TLvmVK1wz9ptWzwmzmi/h8xboGN+6m9+w+ 2bdZ/L3djG0yxkqSKXIXmZfi/mvrS+XNNoz7cHug= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 34A993858434 for ; Thu, 18 May 2023 06:10:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 34A993858434 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-out2.suse.de (Postfix) with ESMTPS id C035D1FD63; Thu, 18 May 2023 06:10:50 +0000 (UTC) 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 A16391390B; Thu, 18 May 2023 06:10:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 06U5JmrBZWRhfgAAMHmgww (envelope-from ); Thu, 18 May 2023 06:10:50 +0000 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] [gdb/testsuite] Fix gdb.tui/wrap-line.exp Date: Thu, 18 May 2023 08:10:46 +0200 Message-Id: <20230518061046.17837-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" PR testsuite/30458 reports the following FAIL: ... PASS: gdb.tui/wrap-line.exp: width-auto-detected: cli: wrap ^CQuit (gdb) WARNING: timeout in accept_gdb_output Screen Dump (size 50 columns x 24 rows, cursor at column 6, row 3): 0 Quit 1 (gdb) 7890123456789012345678901234567890123456789 2 W^CQuit 3 (gdb) ... FAIL: gdb.tui/wrap-line.exp: width-auto-detected: cli: prompt after wrap ... The problem is that the regexp doesn't account for the ^C: ... gdb_assert { [Term::wait_for "^WQuit"] } "prompt after wrap" ... Fix this by updating the regexp, and likewise in another place in the test-case where we use ^C. Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30458 Tested-By: Bruno Larsen --- gdb/testsuite/gdb.tui/wrap-line.exp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) base-commit: 0cc8cc5e6f82b8d3d8e3803c6f7f5e63f0c866ad diff --git a/gdb/testsuite/gdb.tui/wrap-line.exp b/gdb/testsuite/gdb.tui/wrap-line.exp index 4587517504c..2bfe342e04d 100644 --- a/gdb/testsuite/gdb.tui/wrap-line.exp +++ b/gdb/testsuite/gdb.tui/wrap-line.exp @@ -25,6 +25,8 @@ set cols 50 set lines 24 set dims [list $lines $cols] +set re_control_c "(\\^C)?Quit" + # Fill line, assuming we start after the gdb prompt. proc fill_line { width } { set res "" @@ -47,7 +49,7 @@ proc fill_line { width } { proc test_wrap { wrap_width } { # Generate a prompt and parse it. send_gdb "\003" - gdb_assert { [Term::wait_for "(^|$::gdb_prompt )Quit"] } "start line" + gdb_assert { [Term::wait_for "(^|$::gdb_prompt )$::re_control_c"] } "start line" # Fill the line to just before wrapping. set str [fill_line $wrap_width] @@ -64,7 +66,7 @@ proc test_wrap { wrap_width } { # Generate a prompt and parse it. send_gdb "\003" - gdb_assert { [Term::wait_for "^WQuit"] } "prompt after wrap" + gdb_assert { [Term::wait_for "^W$::re_control_c"] } "prompt after wrap" } # Test wrapping in both CLI and TUI.