* gdb.mi/mi-nsmoribund.exp: Revert back to send_gdb/gdb_expect in

	one test.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index adfa1a1..a031053 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-26  Pedro Alves  <pedro@codesourcery.com>
+
+       * gdb.mi/mi-nsmoribund.exp: Revert back to send_gdb/gdb_expect in
+       one test.
+
 2010-08-24  Doug Evans  <dje@google.com>
 
        PR symtab/11942

diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
index 0eaad24..293d06c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
@@ -121,15 +121,21 @@ mi_check_thread_states \
 # goes wrong with moribund locations support or displaced stepping (or
 # a target bug if it can step over breakpoints itself), a spurious
 # SIGTRAP/SIGSEGV can come at any time after deleting the breakpoint.
+# Note that this causes multiple prompts to appear before the output
+# we are interested in, so we can't use mi_gdb_test or
+# gdb_test_multiple (or an MI equivalent)
 
-gdb_test_multiple "102-break-delete\nprint done = 1\n103-exec-continue --all" \
-    "resume all, program exited normally" {
-       -re "\\*stopped,reason=\"exited-normally\"" {
-           pass "resume all, program exited normally"
-       }
-       -re "\\*stopped" {
-           fail "unexpected stop"
-       }
+send_gdb "102-break-delete\n"
+send_gdb "print done = 1\n"
+send_gdb "103-exec-continue --all\n"
+
+gdb_expect {
+    -re "\\*stopped,reason=\"exited-normally\"" {
+       pass "resume all, program exited normally"
     }
+    timeout {
+       fail "resume all, waiting for program exit (timeout)"
+    }
+}
 
 mi_gdb_exit