* gdb.base/interp.exp: Always consume both prompts.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 110832d..a19be75 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-20  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.base/interp.exp: Always consume both prompts.
+
 2008-08-20  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.base/pending.exp: Test pending breakpoints without symbols

diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp
index e01ac0b..5ec4a67 100644 (file)
--- a/gdb/testsuite/gdb.base/interp.exp
+++ b/gdb/testsuite/gdb.base/interp.exp
@@ -21,7 +21,16 @@ if $tracelevel then {
 
 gdb_start
 
-gdb_test "interpreter-exec mi \"-var-update *\"" "\\^done,changelist=[].*"
+# Do not use gdb_test for this test, since it has two prompts.
+set cmd "interpreter-exec mi \"-var-update *\""
+gdb_test_multiple $cmd $cmd {
+    -re "\\^done,changelist=\\\[\\\]\r\n$gdb_prompt " {
+       pass "$cmd"
+       gdb_expect 1 {
+           -re "\r\n$gdb_prompt $" { }
+       }
+    }
+}
 gdb_test "interpreter-exec console \"show version\"" "GNU gdb .*"
 
 gdb_exit