diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-nonstop-exit.exp | 44 |
2 files changed, 12 insertions, 37 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index de2205aee8..afddd7cb3e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2009-04-02 Pedro Alves <pedro@codesourcery.com> + * gdb.mi/mi-nonstop-exit.exp: Don't check isnative. Use + mi_run_to_main. + +2009-04-02 Pedro Alves <pedro@codesourcery.com> + * gdb.mi/mi-nonstop.exp: Don't check isnative. Use mi_run_to_main. Skip thread exit test on remote targets. * gdb.mi/mi-nsintrall.exp: Don't check isnative. Use diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp index 8167a071cd..6becb9260f 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp @@ -14,11 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# This only works with native configurations -if {![isnative]} { - return -} - load_lib mi-support.exp set MIFLAGS "-i=mi" @@ -58,34 +53,10 @@ mi_gdb_test "-gdb-set non-stop 1" ".*" mi_gdb_test "-gdb-set target-async 1" ".*" detect_async -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)*($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 -# target, the logic from mi_run_cmd will have to be refactored. -send_gdb "-exec-run\n" -gdb_expect { - -re "\\^running\r\n$notifs$mi_gdb_prompt" { - } - -re "\\^error,msg=\"The target does not support running in non-stop mode.\"" { - verbose -log "Non-stop mode not supported, skipping all tests" - return - } - -re "\r\n$mi_gdb_prompt" { - perror "Cannot start target (unknown output after running)" - return -1 - } - timeout { - perror "Cannot start target (timeout)" - return -1 - } +if { [mi_run_to_main] < 0 } { + perror "mi-nonstop-exit.exp tests suppressed" + continue } -mi_expect_stop "breakpoint-hit" main ".*" ".*" "\[0-9\]+" { "" "disp=\"del\"" } "run to main" mi_send_resuming_command "exec-continue" "continue" @@ -93,11 +64,10 @@ mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue" # Run the program again. -mi_gdb_test "200-break-insert -t main" ".*" - -mi_send_resuming_command "exec-run" "run (2)" - -mi_expect_stop "breakpoint-hit" main ".*" ".*" "\[0-9\]+" { "" "disp=\"del\"" } "run to main (2)" +if { [mi_run_to_main] < 0 } { + fail "run (2)" + continue +} mi_send_resuming_command "exec-continue" "continue (2)" |
