2006-11-09 Vladimir Prus <vladimir@codesourcery.com>

        * gdb.stabs/weird.exp (print_weird_var): Use
        gdb_test_multiple instead of gdb_expect.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6cec3d7..eb7c9e9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2006-11-09  Vladimir Prus  <vladimir@codesourcery.com>
 
+       * gdb.stabs/weird.exp (print_weird_var): Use
+       gdb_test_multiple instead of gdb_expect.
+
+2006-11-09  Vladimir Prus  <vladimir@codesourcery.com>
+
        * gdb.base/help.exp (help_test_raw): New.
        (test_class_help): New.
        (test_prefix_command_help): New.

diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index cff581b..cb7c40e 100644 (file)
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -228,16 +228,13 @@ proc print_weird_var { var } {
 
        # Make sure that the variable gets printed out correctly, without
        # any sort of warning message.
-       send_gdb "print $var\n"
-       gdb_expect {
+        gdb_test_multiple "print $var\n" "variable $var printed property" {  
                -re "^print $var\r*\n.\[0-9\]* = 42.*$gdb_prompt $" {
                        pass "variable $var printed properly"
                }
                -re ".*$gdb_prompt $" {
                        fail "variable $var printed properly"
                }
-               timeout { fail "variable $var printed properly (timeout)" }
-               eof { fail "variable $var printed properly (eof)" }
        }
 
        # Make sure that the stabs did get loaded in a sensible way.