diff options
| author | mpolacek <mpolacek> | 2011-05-27 14:16:43 +0000 |
|---|---|---|
| committer | mpolacek <mpolacek> | 2011-05-27 14:16:43 +0000 |
| commit | dd76f0447f9920cd958bc504b364dac2c9abd454 (patch) | |
| tree | 25d34ac87a11306154a0663206d9b0f526938441 | |
| parent | ed7cc0ae2782f8cf2a237d2a6b63419a1becef8c (diff) | |
| download | gdb-dd76f0447f9920cd958bc504b364dac2c9abd454.tar.gz | |
gdb.mi/mi-nonstop.exp: Replace gdb_test_multiple with mi_gdb_test.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-nonstop.exp | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d5d24da642a..6726fb11c45 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2011-05-27 Marek Polacek <mpolacek@redhat.com> + * gdb.mi/mi-nonstop.exp: Replace gdb_test_multiple with mi_gdb_test. + +2011-05-27 Marek Polacek <mpolacek@redhat.com> + * gdb.mi/mi-nonstop-exit.exp: Remove the `-gdb-show non-stop' testcase, remove the `supported' variable. * gdb.mi/mi-nonstop.exp: Likewise. diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp index fe009fa7ce9..cb69c2d2ce8 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp @@ -81,22 +81,17 @@ 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" -gdb_test_multiple "-exec-interrupt --thread 1" "interrupted" { - -re "\\^done\r\n$mi_gdb_prompt\\*stopped\[^\r\n\]+\r\n$" { - pass "interrupted" - } -} +mi_gdb_test "-exec-interrupt --thread 1" "\\^done" "interrupted" +mi_expect_interrupt "got interrupt" + # The interrupt command sends SIGINT to the target, and therefore the # thread might not be stopped immediately when we return from the target. # So, wait a bit sleep 1 mi_check_thread_states {"stopped" "stopped" "stopped"} "thread state, stop 4" -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" - } -} +mi_gdb_test "-exec-continue --all" ".*\\*running,thread-id=\"3\"\r\n\\*running,thread-id=\"2\"\r\n\\*running,thread-id=\"1\"" \ + "resume all" mi_expect_stop "breakpoint-hit" "break_at_me" "\[^\n\]*" "non-stop.c" "\[0-9\]*" {"" "disp=\"keep\""} "w0,i2 stop" mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w1,i2 stop" |