Fix races in gdb.mi/mi-var-display.exp.

gdb/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2011-06-21  Marek Polacek  <mpolacek@redhat.com>
+
+        * gdb.mi/mi-var-display.exp: Replace gdb_test_multiple with
+	mi_gdb_test.
+
 2011-06-20  Marek Polacek  <mpolacek@redhat.com>
 
         * gdb.mi/mi-nsintrall.exp: Replace gdb_test_multiple with mi_gdb_test.

gdb/testsuite/gdb.mi/mi-var-display.exp

@@ -605,12 +605,8 @@ mi_gdb_test "-var-list-children anone" \
 
 
 # Record fp
-
-gdb_test_multiple "p/x \$fp" "print FP register" {
-    -re ".*($hex).*\\^done\r\n$mi_gdb_prompt$" { 
-	pass "print FP register"
-	set fp $expect_out(1,string) 
-    }
+if ![mi_gdb_test "p/x \$fp" ".*($hex).*\\^done" "print FP register"] {
+    set fp $expect_out(3,string) 
 }
 
 mi_continue_to "incr_a"