Update copyright year in most headers.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.stabs / weird.exp

diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 7f67ccb132b86505e3440e429db75330d5566429..114c9ec74b3087000076d8c9562e21ca3bac36f1 100644 (file)
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -1,22 +1,18 @@
-# Copyright 1997, 1998, 1999, 2001, 2003, 2004
+# Copyright 1997, 1998, 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test that GDB properly ignores invalid stabs.
 # Also test that GDB can debug a .o file, and that it doesn't mind
@@ -228,16 +224,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" "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.
@@ -290,7 +283,8 @@ if { [lindex $exec_output 0] != 0 } {
 }
 
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested weird.exp
+     return -1
 }
 
 remote_file build delete ${srcfile}
@@ -313,7 +307,7 @@ gdb_expect 60 {
     -re "^file (\[^ \]| +\008)*\r*\n" {
        exp_continue
     }
-    -re "A program is being debugged already.  Kill it\\? \\(y or n\\)" {
+    -re "A program is being debugged already.\[\r\n\]+Are you sure you want to change the file\\? \\(y or n\\)" {
        send_gdb "y\n"
        exp_continue
     }