OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Pedro Alves 2017-11-09 22:44:09 +00:00
parent 2c88253fc4
commit a60e07381c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
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.

2
gdb/testsuite/gdb.cp/cpcompletion.exp
View File

@ -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