From patchwork Thu Dec 12 02:19:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 36750 Received: (qmail 109528 invoked by alias); 12 Dec 2019 02:19:29 -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 109516 invoked by uid 89); 12 Dec 2019 02:19:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=literally, H*Ad:U*tom X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.47.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Dec 2019 02:19:27 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 7A4DEDCB2 for ; Wed, 11 Dec 2019 20:19:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fE4ciGN4gqNtvfE4ciz77x; Wed, 11 Dec 2019 20:19:26 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=T4XZ4WIDPf5yGyZjwTdv6Q54nQMyd5fkbRY4OlNd3os=; b=C7nZrH/9BKf2c3qVRc6HbWqeX+ KNxGYCDTcxUyahmHvLUA7Y5X7CC/K/r9fDeQQ+I5aqoJJv4w4Ta9m+BoalsM98EybQfjPo7LW30rN 77l9XiMZKc2B7pU0ImsRjnhvm; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:47886 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1ifE4c-002SKa-8A; Wed, 11 Dec 2019 19:19:26 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [FYI] Fix TUI test suite regexps Date: Wed, 11 Dec 2019 19:19:24 -0700 Message-Id: <20191212021924.16638-1-tom@tromey.com> Testing on another TUI series showed that some of the regexps in the TUI test suite have been incorrect for a while. In particular, "|" was meant literally in these tests, but was interpreted as pattern alternation due to lack of quoting. This patch fixes the bad tests. I am checking this in. gdb/testsuite/ChangeLog 2019-12-11 Tom Tromey * gdb.tui/resize.exp: Fix regexp. * gdb.tui/regs.exp: Fix regexps. * gdb.tui/main.exp: Fix regexp. Change-Id: Ib6661361171ac120bb92f4a8aec7efa4bcaa36b9 --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.tui/main.exp | 2 +- gdb/testsuite/gdb.tui/regs.exp | 4 ++-- gdb/testsuite/gdb.tui/resize.exp | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.tui/main.exp b/gdb/testsuite/gdb.tui/main.exp index eab28deb15d..57ddb52bf36 100644 --- a/gdb/testsuite/gdb.tui/main.exp +++ b/gdb/testsuite/gdb.tui/main.exp @@ -31,4 +31,4 @@ if {![Term::enter_tui]} { } Term::command "file [standard_output_file $testfile]" -Term::check_contents "show main after file" ">|21 *return 0" +Term::check_contents "show main after file" "\\|.*21 *return 0" diff --git a/gdb/testsuite/gdb.tui/regs.exp b/gdb/testsuite/gdb.tui/regs.exp index dcecd03af9a..d0114a2a230 100644 --- a/gdb/testsuite/gdb.tui/regs.exp +++ b/gdb/testsuite/gdb.tui/regs.exp @@ -34,7 +34,7 @@ if {![Term::enter_tui]} { unsupported "TUI not supported" } -Term::check_contents "source at startup" ">|21 *return 0" +Term::check_contents "source at startup" "\\|.*21 *return 0" Term::command "layout regs" Term::check_box "register box" 0 0 80 7 @@ -42,4 +42,4 @@ Term::check_box "source box in regs layout" 0 6 80 9 set text [Term::get_line 1] # Just check for any register window content at all. -Term::check_contents "any register contents" "^|.*\[^ \].*|$" +Term::check_contents "any register contents" "\\|.*\[^ \].*\\|" diff --git a/gdb/testsuite/gdb.tui/resize.exp b/gdb/testsuite/gdb.tui/resize.exp index c5302799ea5..d210aaa74c2 100644 --- a/gdb/testsuite/gdb.tui/resize.exp +++ b/gdb/testsuite/gdb.tui/resize.exp @@ -34,7 +34,7 @@ if {![Term::enter_tui]} { unsupported "TUI not supported" } -Term::check_contents "source at startup" ">|21 *return 0" +Term::check_contents "source at startup" "\\|.*21 *return 0" Term::resize 40 90 Term::check_box "source box after resize" 0 0 90 26