daily update

[external/binutils.git] / gdb / testsuite / gdb.mi / mi2-stepi.exp

diff --git a/gdb/testsuite/gdb.mi/mi2-stepi.exp b/gdb/testsuite/gdb.mi/mi2-stepi.exp
index adfea7a..d715f4e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi2-stepi.exp
@@ -1,19 +1,18 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 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.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test Machine interface (MI) operations 
 # Verify that, using the MI, we can run a simple program and perform
@@ -34,16 +33,12 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-stepi
 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-stepi.exp
+     return -1
 }
 
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
 proc test_stepi_nexti {} {
     global mi_gdb_prompt
     global hex fullname_syntax srcfile
@@ -52,47 +47,28 @@ proc test_stepi_nexti {} {
     set line_main_body  [expr $line_main_head + 2]
     set line_main_hello [gdb_get_line_number "Hello, World!"]
 
-    send_gdb "111-exec-step-instruction\n"
-    gdb_expect {
-       -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-           set line $expect_out(2,string)
-           if { $line >= $line_main_body && $line <= $line_main_hello } {
-               pass "step-instruction at main"
-           } else {
-               fail "step-instruction at main"
-           }
-       }
-       timeout {
-           fail "step-instruction at main (timeout)"
-       }
-    }
-    send_gdb "222-exec-next-instruction\n"
-    gdb_expect {
-       -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-           set line $expect_out(2,string)
-           if { $line >= $line_main_body && $line <= $line_main_hello } {
-               pass "next-instruction at main"
-           } else {
-               fail "next-instruction at main"
-           }
-       }
-       timeout {
-           fail "next-instruction at main (timeout)"
-       }
+    set line [mi_execute_to "exec-step-instruction" "end-stepping-range" "main" "" \
+                  ".*basics.c" "\[0-9\]+" "" "step-instruction at main"]
+    if { $line >= $line_main_body && $line <= $line_main_hello } {
+               pass "step-instruction at main (line check)"
+    } else {
+        fail "step-instruction at main (line check)"
+    }    
+
+    set line [mi_execute_to "exec-next-instruction" "end-stepping-range" "main" "" \
+                  ".*basics.c" "\[0-9\]+" "" "next-instruction at main"]
+    if { $line >= $line_main_body && $line <= $line_main_hello } {
+        pass "next-instruction at main (line check)"
+    } else {
+        fail "next-instruction at main (line check)"
     }
-    send_gdb "333-exec-next-instruction\n"
-    gdb_expect {
-       -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-           set line $expect_out(2,string)
-           if { $line >= $line_main_body && $line <= $line_main_hello } {
-               pass "next-instruction at main"
-           } else {
-               fail "next-instruction at main"
-           }
-       }
-       timeout {
-           fail "next-instruction at main (timeout)"
-       }
+
+    set line [mi_execute_to "exec-next-instruction" "end-stepping-range" "main" "" \
+                  ".*basics.c" "\[0-9\]+" "" "next-instruction at main 2"]
+    if { $line >= $line_main_body && $line <= $line_main_hello } {
+        pass "next-instruction at main 2 (line check)"
+    } else {
+        fail "next-instruction at main 2 (line check)"
     }
 }