[PATCH] gdb.mi/mi-nonstop.exp: fix racy tests (PR testsuite/12649)

[Marek Polacek <mpolacek at redhat dot com>]

In this test, there were three occurrences of the gdb_tes_multiple.  All
of them are of course causing races.  

The first case is exactly the same as in `mi-nonstop-exit.exp'.

The second test case cannot be, I think, converted to mi_gdb_test :(.  It is
because mi_gdb_test automatically appends `\[\r\n\]+$mi_gdb_prompt', but in
this particular case, we don't want this, since we expect the following
(no prompt at the end, instead, prompt is in the middle):

-exec-interrupt --thread 1
^done
(gdb) 
*stopped,reason="signal-received",signal-name="0",signal-meaning="...

And the third case could be, fortunately, converted into mi_gdb_test.

Tested with both read{,1}.  Ok?  

2011-05-19  Marek Polacek  <mpolacek@redhat.com>

        * gdb.mi/mi-nonstop.exp: Use the send_gdb+gdb_expect or mi_gdb_test
        instead of the gdb_test_multiple.

--- gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp.mp	2011-01-01 16:33:47.000000000 +0100
+++ gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp	2011-05-19 12:33:22.038216967 +0200
@@ -47,13 +47,17 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load $binfile
 
 set supported 0
-gdb_test_multiple "-gdb-show non-stop" "" {
-    -re ".*\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" {
+send_gdb "-gdb-show non-stop\n"
+gdb_expect {
+    -re "\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" {
 	if { $expect_out(1,string) == "1" } {
 	    set supported 1
 	}
     }
+    -re "\\^done,value=\"off\"\r\n$mi_gdb_prompt$" {
+    }
     -re ".*$mi_gdb_prompt$" {
+	fail "-gdb-show non-stop"
     }
 }
 
@@ -92,22 +96,21 @@ mi_varobj_update * {I_W1 I_W0} "update v
 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" {
+send_gdb "-exec-interrupt --thread 1\n"
+gdb_expect {
     -re "\\^done\r\n$mi_gdb_prompt\\*stopped\[^\r\n\]+\r\n$" {
 	pass "interrupted"
     }
 }
+
 # 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"