Fix races in mi2-var-display.exp.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8d07e4af6e45ab122465635d1e03d06fd9a4f8cf..d60370f1760a3109a76cb424bbb88ecfcdbb4d0b 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  Marek Polacek  <mpolacek@redhat.com>
+
+       * gdb.mi/mi2-var-display.exp: Replace gdb_test_multiple with
+       mi_gdb_test.
+
 2011-06-23  Marek Polacek  <mpolacek@redhat.com>
 
        * gdb.mi/mi2-return.exp: Replace gdb_test_multiple with mi_gdb_test.
@@ -141,7 +146,7 @@
 
 2011-05-27  Marek Polacek  <mpolacek@redhat.com>
 
-        * gdb.mi/mi-nonstop.exp: Replace gdb_test_multiple with mi_gdb_test.
+       * gdb.mi/mi-nonstop.exp: Replace gdb_test_multiple with mi_gdb_test.
 
 2011-05-27  Marek Polacek  <mpolacek@redhat.com>
 

diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp
index 6390698028246c365dbe34327863435e7836d2e8..828614b3757c67a3912546ea5f5317bcc21aca2e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp
@@ -604,12 +604,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"