diff options
Diffstat (limited to 'gdb/testsuite/gdb.mi/mi-nsintrall.exp')
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-nsintrall.exp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp index 9ba197af5d3..cd277b259e9 100644 --- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp +++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp @@ -37,14 +37,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\n" "" { -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$" { } } @@ -78,14 +77,10 @@ for {set i 6} {$i > 0} {incr i -1} { set running_re "$running_re\\*running,thread-id=\"$i\"\r\n" } -send_gdb "-exec-continue --all\n" -gdb_expect { +gdb_test_multiple "-exec-continue --all" "resume all, no breakpoint" { -re ".*$running_re$mi_gdb_prompt" { pass "resume all, no breakpoint" } - timeout { - fail "resume all, no breakpoint (timeout)" - } } mi_check_thread_states \ {"running" "running" "running" "running" "running" "running"} \ @@ -101,14 +96,10 @@ mi_check_thread_states \ "thread state, all interrupted" # resume all threads, and check that no thread is spuriously left interrupted -send_gdb "-exec-continue --all\n" -gdb_expect { +gdb_test_multiple "-exec-continue --all" "resume all after interrupting" { -re ".*$running_re$mi_gdb_prompt" { pass "resume all after interrupting" } - timeout { - fail "resume all after interrupting (timeout)" - } } sleep 1 |