* gdb.mi/mi-nonstop.exp: Do not call perror if non-stop mode is

[binutils-gdb.git] / gdb / testsuite / gdb.mi / mi-nonstop.exp

diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp
index 18c08df6e04a2f777d3dca88dd0b6356120da468..0ac00cf983ed534ef605ef07d2c043ffd84befd0 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp
@@ -1,4 +1,4 @@
-# Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009
+# Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,15 @@ if {[mi_gdb_start]} {
     continue
 }
 
+proc mi_nonstop_resume { command test } {
+    if { [mi_send_resuming_command $command $test] != 0 } {
+       # If a resume fails, assume non-stop is broken or unsupported
+       # for this target.  We have logged a FAIL or UNSUPPORTED; skip
+       # the remaining tests to limit timeouts.
+       return -code continue
+    }
+}
+
 #
 # Start here
 #
@@ -38,14 +47,13 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load $binfile
 
 set supported 0
-send_gdb "-gdb-show non-stop\n"
-gdb_expect {
+gdb_test_multiple "-gdb-show non-stop" "" {
     -re ".*\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" {
        if { $expect_out(1,string) == "1" } {
            set supported 1
        }
     }
-    -re ".$mi_gdb_prompt$" {
+    -re ".*$mi_gdb_prompt$" {
     }
 }
 
@@ -54,13 +62,12 @@ mi_gdb_test "-gdb-set target-async 1" ".*"
 detect_async
 
 if { [mi_run_to_main] < 0 } {
-    perror "mi-nonstop.exp tests suppressed"
     continue
 }
 
 mi_create_breakpoint break_at_me 2 keep break_at_me .* .* .* "breakpoint at marker"
 
-mi_send_resuming_command "exec-continue" "resume 1"
+mi_nonstop_resume "exec-continue" "resume 1"
 mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w0,i0 stop"
 mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w1,i0 stop"
 
@@ -71,12 +78,12 @@ mi_create_varobj I_W0 "i" "create varobj in first thread"
 mi_gdb_test "-thread-select 3" "\\^done.*" "select thread 3"
 mi_create_varobj I_W1 "i" "create varobj in second thread" 
 
-mi_send_resuming_command "exec-continue --thread 2" "resume 1"
+mi_nonstop_resume "exec-continue --thread 2" "resume 1"
 mi_check_thread_states {"running" "running" "stopped"} "thread state, resume 1"
 mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w0,i1 stop"
 mi_check_thread_states {"running" "stopped" "stopped"} "thread state, stop 2"
 
-mi_send_resuming_command "exec-continue --thread 3" "resume 2"
+mi_nonstop_resume "exec-continue --thread 3" "resume 2"
 mi_check_thread_states {"running" "stopped" "running"} "thread state, resume 2"
 mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w1,i1 stop"
 mi_check_thread_states {"running" "stopped" "stopped"} "thread state, stop 3"
@@ -85,14 +92,10 @@ mi_varobj_update * {I_W1 I_W0} "update varobj, 1"
 mi_check_varobj_value I_W0 1 "check varobj, w0, 1"
 mi_check_varobj_value I_W1 1 "check varobj, w1, 1"
 
-send_gdb "-exec-interrupt --thread 1\n"
-gdb_expect {
+gdb_test_multiple "-exec-interrupt --thread 1" "interrupted" {
     -re "\\^done\r\n$mi_gdb_prompt\\*stopped\[^\r\n\]+\r\n$" {
        pass "interrupted"
     }
-    timeout {
-       fail "interrupted (timeout)"
-    }
 }
 # The interrupt command sends SIGINT to the target, and therefore the
 # thread might not be stopped immediately when we return from the target.
@@ -100,14 +103,10 @@ gdb_expect {
 sleep 1
 mi_check_thread_states {"stopped" "stopped" "stopped"} "thread state, stop 4"
 
-send_gdb "-exec-continue --all\n"
-gdb_expect {
+gdb_test_multiple "-exec-continue --all" "resume all" {
     -re ".*\\*running,thread-id=\"3\"\r\n\\*running,thread-id=\"2\"\r\n\\*running,thread-id=\"1\"\r\n$mi_gdb_prompt" {
        pass "resume all"
     }
-    timeout {
-       fail "resume all (timeout)"
-    }
 }
 
 mi_expect_stop "breakpoint-hit" "break_at_me" "\[^\n\]*" "non-stop.c" "\[0-9\]*" {"" "disp=\"keep\""} "w0,i2 stop"
@@ -118,8 +117,8 @@ mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\
 # running thread.
 mi_gdb_test "-break-condition --thread 1 2 id==1" "\\^done" "set condition, 1"
 
-mi_send_resuming_command "exec-continue --thread 2" "resume 2"
-mi_send_resuming_command "exec-continue --thread 3" "resume 3"
+mi_nonstop_resume "exec-continue --thread 2" "resume 2"
+mi_nonstop_resume "exec-continue --thread 3" "resume 3"
 
 sleep 2
 mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w0,i3 stop"
@@ -151,7 +150,7 @@ if { [is_remote target] } {
     unsupported $test
 } else {
     gdb_expect {
-       -re ".*=thread-exited,id=\"2\",group-id=\"\[0-9\]+\"\r\n$" {
+       -re ".*=thread-exited,id=\"2\",group-id=\"i\[0-9\]+\"\r\n$" {
            pass $test
        }
        timeout {