* gdb.stabs/wierd.exp: Check for eof, directly or via gdb_test.

	Remove some xfails

diff --git a/gdb/testsuite/gdb.stabs/wierd.exp b/gdb/testsuite/gdb.stabs/wierd.exp
index f0af04922548b605c9c957e23d6a9424abb8f04c..db7487b409a4c97909329e7c15c46fd5596f801a 100644 (file)
--- a/gdb/testsuite/gdb.stabs/wierd.exp
+++ b/gdb/testsuite/gdb.stabs/wierd.exp
@@ -32,14 +32,13 @@ expect {
                error "couldn't load $binfile into $GDB (timed out)."
                return -1
        }
+       eof { fail "(eof) cannot read wierd.o" }
 }
 
 proc print_wierd_var { var } {
        global prompt
 
-       # Currently one of these symbols gives an error() in symbol
-       # reading, which causes any attempt to read (full, not
-       # partial) symbols for the file to lose.
+       # GDB does not yet understand type attributes
        setup_xfail "*-*-*"
 
        # Make sure that the variable gets printed out correctly, without
@@ -55,24 +54,17 @@ proc print_wierd_var { var } {
                        return 0
                }
                timeout { fail "variable $var not printed (timeout)" }
+               eof { fail "(eof) variable $var not printed" }
        }
 
-       # Currently one of these symbols gives an error() in symbol
-       # reading, which causes any attempt to read (full, not
-       # partial) symbols for the file to lose.
+       # GDB does not yet understand type attributes
        setup_xfail "*-*-*"
 
        # Make sure that the stabs did get loaded in a sensible way.
        # If somehow the stabs got skipped, then the above test can
        # pass because GDB assumes int for variables without a stab.
 
-       send "whatis $var\n"
-       expect {
-               -re "type = unsigned int.*$prompt $" {pass "whatis on $var"}
-               -re "type = inttype.*$prompt $" {pass "whatis on $var"}
-               -re "$prompt $" {fail "whatis on $var"}
-               timeout {fail "whatis on $var"}
-       }
+  gdb_test "whatis $var\n" "type = (unsigned int|inttype)" "whatis on $var"
 }
 
 print_wierd_var var0
@@ -163,19 +155,8 @@ print_wierd_var attr124
 print_wierd_var attr125
 print_wierd_var attr126
 
-# Currently one of these symbols gives an error() in symbol
-# reading, which causes any attempt to read (full, not
-# partial) symbols for the file to lose.
-setup_xfail "*-*-*"
-
 # One last test, while we're at it.
-send "ptype inttype\n"
-expect {
-       -re "type = unsigned int.*$prompt $" {pass "ptype on inttype"}
-       -re "type = inttype.*$prompt $" {pass "ptype on inttype"}
-       -re "$prompt $" {fail "ptype on inttype"}
-       timeout {fail "ptype on inttype"}
-}
+gdb_test "ptype inttype\n" "type = (unsigned int|inttype)" "ptype on inttype"
 
 #Prevent some failures in default.exp, which are probably GDB bugs
 # (but trivial ones).