From 1ee4023ae3e66cd79c2097ed214b8b0d33808708 Mon Sep 17 00:00:00 2001
From: Marek Polacek <mpolacek@sourceware.org>
Date: Wed, 22 Jun 2011 15:41:47 +0000
Subject: [PATCH] Fix races in gdb.mi/mi-nsitrall.exp.

---
 gdb/testsuite/ChangeLog               |  4 ++++
 gdb/testsuite/gdb.mi/mi-nsintrall.exp | 20 +++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fdc131c554..57e332f6e3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-20  Marek Polacek  <mpolacek@redhat.com>
+
+        * gdb.mi/mi-nsintrall.exp: Replace gdb_test_multiple with mi_gdb_test.
+
 2011-06-20  Marek Polacek  <mpolacek@redhat.com>
 
         * gdb.mi/mi-nsmoribund.exp: Replace gdb_test_multiple with
diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
index 82d97151e3..6e1290ab90 100644
--- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
@@ -60,16 +60,17 @@ mi_check_thread_states \
 # now that we know about all the threads, we can get rid of the breakpoints
 mi_delete_breakpoints
 
+# Here we create a response string.  Note we don't want \r\n at the end,
+# since mi_gdb_test will append this itself.
 set running_re ""
-for {set i 6} {$i > 0} {incr i -1} {
+for {set i 6} {$i > 1} {incr i -1} {
     set running_re "$running_re\\*running,thread-id=\"$i\"\r\n"
 }
+set running_re "$running_re\\*running,thread-id=\"1\""
+
+mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \
+    "resume all, no breakpoint"
 
-gdb_test_multiple "-exec-continue --all" "resume all, no breakpoint" {
-    -re ".*$running_re$mi_gdb_prompt" {
-	pass "resume all, no breakpoint"
-    }
-}
 mi_check_thread_states \
     {"running" "running" "running" "running" "running" "running"} \
     "thread state, resume all"
@@ -84,11 +85,8 @@ mi_check_thread_states \
     "thread state, all interrupted"
 
 # resume all threads, and check that no thread is spuriously left interrupted
-gdb_test_multiple "-exec-continue --all" "resume all after interrupting" {
-    -re ".*$running_re$mi_gdb_prompt" {
-	pass "resume all after interrupting"
-    }
-}
+mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \
+    "resume all after interrupting"
 
 sleep 1
 mi_check_thread_states \