run copyright.sh for 2011.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.mi / mi2-console.exp

diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index dba80c9f6064bea139aa50434368a2fad903a0c8..0d052560aa2f74c9cd485b1e808cf4817ced4dbd 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ b/gdb/testsuite/gdb.mi/mi2-console.exp
@@ -1,21 +1,18 @@
-# Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011
+# 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 essential Machine interface (MI) operations
@@ -44,54 +41,43 @@ set testfile "mi-console"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-console.exp
+     return -1
 }
 
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
 mi_run_to_main
 
 # Next over the hello() call which will produce lots of output
-send_gdb "47-exec-next\n"
-gdb_expect {
-    -re "47\\^running\r\n$mi_gdb_prompt" {
+gdb_test_multiple "220-exec-next" "Started step over hello" {
+    -re "220\\^running\r\n(\\*running,thread-id=\"all\"\r\n)?$mi_gdb_prompt" {
        pass "Started step over hello"
     }
-    timeout {
-       fail "Started step over hello (timeout)"
-    }
 }
 
-gdb_expect {
-    -re "@\"H\"\r\n.*@\"e\"\r\n.*@\"l\"\r\n.*@\"l\"\r\n.*@\"o\"\r\n.*@\" \"\r\n.*@\"\\\\\\\\\"\r\n.*@\"\\\\\"\"\r\n.*@\"!\"\r\n.*@\"\\\\r\"\r\n.*@\"\\\\n\"\r\n" {
-       pass "Hello message"
-    }
-    -re "Hello" {
-
-       # Probably a native system where GDB doesn't have direct
-       # control over the inferior console.
-       # For this to work, GDB would need to run the inferior process
-       # under a PTY and then use the even-loops ability to wait on
-       # multiple event sources to channel the output back through the
-       # MI.
+if { ![target_info exists gdb,noinferiorio] } {
+    gdb_expect {
+       -re "@\"H\"\r\n.*@\"e\"\r\n.*@\"l\"\r\n.*@\"l\"\r\n.*@\"o\"\r\n.*@\" \"\r\n.*@\"\\\\\\\\\"\r\n.*@\"\\\\\"\"\r\n.*@\"!\"\r\n.*@\"\\\\r\"\r\n.*@\"\\\\n\"\r\n" {
+           pass "Hello message"
+       }
+       -re "Hello" {
+           
+           # Probably a native system where GDB doesn't have direct #
+           # control over the inferior console.  # For this to work,
+           # GDB would need to run the inferior process # under a PTY
+           # and then use the even-loops ability to wait on #
+           # multiple event sources to channel the output back
+           # through the # MI.
 
-       kfail "gdb/623" "Hello message"
-    }
-    timeout {
-       fail "Hello message (timeout)"
-    }
-}
-    
-gdb_expect {
-    -re "47\\*stopped.*$mi_gdb_prompt$" {
-       pass "Finished step over hello"
-    }
-    timeout {
-       fail "Finished step over hello (timeout)"
+           kfail "gdb/623" "Hello message"
+       }
+       timeout {
+           fail "Hello message (timeout)"
+       }
     }
 }
 
+mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" "14" "" \
+    "finished step over hello"
+
 mi_gdb_exit
 return 0