diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-nonstop.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-nsintrall.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-nsmoribund.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 7 |
5 files changed, 17 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6c22a66..9b36fd1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,14 @@ 2009-02-17 Vladimir Prus <vladimir@codesourcery.com> + * gdb.mi/mi-nonstop.exp (notifs): Adjust for library + notifications. + * gdb.mi/mi-nsintrall.exp (notifs): Likewise. + * gdb.mi/mi-nsmoribund.exp (notifs): Likewise. + * lib/mi-support.exp (library_loaded_re): New. + (mi_run_cmd, mi_send_resuming_command_raw): Adjust. + +2009-02-17 Vladimir Prus <vladimir@codesourcery.com> + * gdb.gdb/observer.exp: Use test_notification observer, not normal_stop, everywhere. (test_normal_stop_notifications): Rename to... diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp index 2521ae5..08952b0 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp @@ -63,7 +63,7 @@ mi_gdb_test "200-break-insert -t main" ".*" set created "=thread-created,id=\"$decimal\"\r\n" set running "\\*running,thread-id=\"$decimal\"\r\n" -set notifs "($created)*($running)*" +set notifs "($created)*($running)*($library_loaded_re)*" # Note: presently, we skip this test on non-native targets, # so 'run' is OK. As soon as we start to run this on remote diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp index b0d7b71..d34b08d 100644 --- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp +++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp @@ -62,7 +62,7 @@ mi_gdb_test "200-break-insert -t main" ".*" set created "=thread-created,id=\"$decimal\"\r\n" set running "\\*running,thread-id=\"$decimal\"\r\n" -set notifs "($created)*($running)*" +set notifs "($created)*($running)*($library_loaded_re)*" # Note: presently, we skip this test on non-native targets, # so 'run' is OK. As soon as we start to run this on remote diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp index b836c5b..505fc84 100644 --- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp +++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp @@ -62,7 +62,7 @@ mi_gdb_test "200-break-insert -t main" ".*" set created "=thread-created,id=\"$decimal\"\r\n" set running "\\*running,thread-id=\"$decimal\"\r\n" -set notifs "($created)*($running)*" +set notifs "($created)*($running)*($library_loaded_re)*" # Note: presently, we skip this test on non-native targets, # so 'run' is OK. As soon as we start to run this on remote diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index a2aa629..f62c240 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -31,6 +31,7 @@ global mi_inferior_tty_name set MIFLAGS "-i=mi" set thread_selected_re "=thread-selected,id=\"\[0-9+\]\"\r\n" +set library_loaded_re "=library-loaded\[^\n\]+\"\r\n" # # mi_gdb_exit -- exit the GDB, killing the target program if necessary @@ -778,6 +779,7 @@ proc mi_run_cmd {args} { } global mi_gdb_prompt global thread_selected_re + global library_loaded_re if [target_info exists gdb_init_command] { send_gdb "[target_info gdb_init_command]\n"; @@ -819,7 +821,7 @@ proc mi_run_cmd {args} { send_gdb "220-exec-run $args\n" gdb_expect { - -re "220\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n|=thread-created,id=\"1\",group-id=\"\[0-9\]+\"\r\n)*(${thread_selected_re})?${mi_gdb_prompt}" { + -re "220\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n|=thread-created,id=\"1\",group-id=\"\[0-9\]+\"\r\n)*(${library_loaded_re})*(${thread_selected_re})?${mi_gdb_prompt}" { } timeout { perror "Unable to start target" @@ -1435,10 +1437,11 @@ proc mi_send_resuming_command_raw {command test} { global mi_gdb_prompt global thread_selected_re + global library_loaded_re send_gdb "$command\n" gdb_expect { - -re "\\^running\r\n\\*running,thread-id=\"\[^\"\]+\"\r\n($thread_selected_re)?${mi_gdb_prompt}" { + -re "\\^running\r\n\\*running,thread-id=\"\[^\"\]+\"\r\n($library_loaded_re)*($thread_selected_re)?${mi_gdb_prompt}" { # Note that lack of 'pass' call here -- this works around limitation # in DejaGNU xfail mechanism. mi-until.exp has this: # |