diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-10-28 08:32:35 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-10-28 08:32:35 +0000 |
| commit | ca539be87d462a966f18524bd8656c7d5a1e1c4f (patch) | |
| tree | 86aeef2690c4ef7283bd45b720796074e702502c | |
| parent | e0c6ef61c66c8edd92e4e859ced871247994205f (diff) | |
| download | gdb-ca539be87d462a966f18524bd8656c7d5a1e1c4f.zip gdb-ca539be87d462a966f18524bd8656c7d5a1e1c4f.tar.gz gdb-ca539be87d462a966f18524bd8656c7d5a1e1c4f.tar.bz2 | |
gdb/testsuite/
* lib/mi-support.exp (breakpoint_re): Suppress match reporting.
(mi_gdb_test): Import globals thread_selected_re
and breakpoint_re. Expect them optionally at the regex start.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5bb77c2..8e2145e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-10-27 Jan Kratochvil <jan.kratochvil@redhat.com> + + * lib/mi-support.exp (breakpoint_re): Suppress match reporting. + (mi_gdb_test): Import globals thread_selected_re + and breakpoint_re. Expect them optionally at the regex start. + 2011-10-27 Doug Evans <dje@google.com> * gdb.python/python.exp: Test source -s. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index c8ec00d..fd57de1 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -32,7 +32,7 @@ set MIFLAGS "-i=mi" set thread_selected_re "=thread-selected,id=\"\[0-9\]+\"\r\n" set library_loaded_re "=library-loaded\[^\n\]+\"\r\n" -set breakpoint_re "=(breakpoint-created|breakpoint-deleted)\[^\n\]+\"\r\n" +set breakpoint_re "=(?:breakpoint-created|breakpoint-deleted)\[^\n\]+\"\r\n" # # mi_gdb_exit -- exit the GDB, killing the target program if necessary @@ -576,7 +576,7 @@ proc mi_gdb_test { args } { global verbose global mi_gdb_prompt global GDB expect_out - global inferior_exited_re + global inferior_exited_re thread_selected_re breakpoint_re upvar timeout timeout set command [lindex $args 0] @@ -668,7 +668,7 @@ proc mi_gdb_test { args } { gdb_start set result -1 } - -re "^($string_regex\[\r\n\]+)?($pattern\[\r\n\]+$mi_gdb_prompt\[ \]*)" { + -re "^(?:$thread_selected_re|$breakpoint_re)*($string_regex\[\r\n\]+)?($pattern\[\r\n\]+$mi_gdb_prompt\[ \]*)" { # At this point, $expect_out(1,string) is the MI input command. # and $expect_out(2,string) is the MI output command. # If $expect_out(1,string) is "", then there was no MI input command here. |