From 873de05c85f79a385863b39b1de2a7add9d15a07 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 11 Dec 2019 19:17:47 -0700 Subject: [PATCH] Fix TUI test suite regexps 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/ChangeLog b/gdb/testsuite/ChangeLog index cf3fcb7b9b0..b31e8dd6115 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-12-11 Tom Tromey + + * gdb.tui/resize.exp: Fix regexp. + * gdb.tui/regs.exp: Fix regexps. + * gdb.tui/main.exp: Fix regexp. + 2019-12-11 Tom Tromey * gdb.tui/resize.exp: Update. 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 -- 2.30.2