From a60e07381c812ab82aff9abae203fd192f460ef4 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 9 Nov 2017 22:44:09 +0000 Subject: [PATCH] Fix racy output matching in gdb.base/cpcompletion.exp With: $ make check-read1 TESTS="gdb.cp/cpcompletion.exp" we get (from gdb.log): (gdb) complete break Foo:: break Foo::Foo() break Foo::Foofoo() break Foo::get_foo() break Foo::set_foo(int) break Foo::~Foo() (gdb) FAIL: gdb.cp/cpcompletion.exp: complete class methods (Foo not found) The problem is that the "break ${class}::\[A-Za-z0-9_~\]+" regexp patches partial input, like: break Foo::F break Foo::Fo break Foo::Foo etc. Fix that by expecting each whole line. gdb/testsuite/ChangeLog: 2017-11-09 Pedro Alves * gdb.cp/cpcompletion.exp (test_class_complete): Tighten regex to match till end of line. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.cp/cpcompletion.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ffd314c30cc..c6c5260dd06 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-09 Pedro Alves + + * gdb.cp/cpcompletion.exp (test_class_complete): Tighten regex to + match till end of line. + 2017-11-09 Pedro Alves * gdb.base/memattr.exp: Tighten regexes to match the end line. diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp index d4da1d2e3e0..c7883ee3766 100644 --- a/gdb/testsuite/gdb.cp/cpcompletion.exp +++ b/gdb/testsuite/gdb.cp/cpcompletion.exp @@ -26,7 +26,7 @@ proc test_class_complete {class expr name matches} { gdb_test_multiple $cmd $name { "break ${class}::main" { fail "$name (saw global symbol)" } $cmd { exp_continue } - -re "break ${class}::\[A-Za-z0-9_~\]+" { + -re "break ${class}::\[^\r\n\]*\r\n" { set str $expect_out(0,string) scan $str "break ${class}::%\[^(\]" method lappend seen $method -- 2.30.2