diff options
| author | Pedro Alves <palves@redhat.com> | 2017-11-09 22:44:09 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2017-11-09 22:46:06 +0000 |
| commit | a60e07381c812ab82aff9abae203fd192f460ef4 (patch) | |
| tree | 1d28610586cfc9e3ea404593cb7ef36d8d1b98e8 | |
| parent | 2c88253fc469fbf40be7f0d1f7060b81055f2eb1 (diff) | |
| download | binutils-gdb-a60e07381c812ab82aff9abae203fd192f460ef4.tar.gz | |
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 <palves@redhat.com>
* gdb.cp/cpcompletion.exp (test_class_complete): Tighten regex to
match till end of line.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/cpcompletion.exp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ffd314c30cc..c6c5260dd06 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2017-11-09 Pedro Alves <palves@redhat.com> + * gdb.cp/cpcompletion.exp (test_class_complete): Tighten regex to + match till end of line. + +2017-11-09 Pedro Alves <palves@redhat.com> + * gdb.base/memattr.exp: Tighten regexes to match the end line. 2017-11-09 Pedro Alves <palves@redhat.com> 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 |