binutils/

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

diff --git a/gdb/testsuite/gdb.mi/mi2-until.exp b/gdb/testsuite/gdb.mi/mi2-until.exp
index c7f3a3b..07f2e52 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-until.exp
+++ b/gdb/testsuite/gdb.mi/mi2-until.exp
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2003, 2005, 2007 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 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
@@ -13,9 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # Test Machine interface (MI) operations 
 # Verify that, using the MI, we can run a simple program and perform
 # exec-until.  
@@ -50,23 +48,12 @@ proc test_running_to_foo {} {
     global mi_gdb_prompt
     global hex
 
-    mi_gdb_test "200-break-insert 10" \
-             "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"foo\",file=\".*until.c\",line=\"10\",times=\"0\"\}" \
+    mi_create_breakpoint "10" 1 "keep" foo ".*until.c" 10 ".*" \
              "break-insert operation"
 
     mi_run_cmd
-
-    gdb_expect {
-       -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
-           pass "run to main"
-       }
-       -re ".*$mi_gdb_prompt$" {
-           fail "run to main (2)"
-       }
-       timeout {
-           fail "run to main (timeout)"
-       }
-    }
+    mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 \
+       { "" "disp=\"keep\"" } "run to main"
 
     mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"
 
@@ -76,51 +63,19 @@ proc test_until {} {
     global mi_gdb_prompt
     global hex fullname_syntax srcfile
 
-    send_gdb "111-exec-until\n"
-    gdb_expect {
-       -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
-           pass "until after while loop"
-       }
-       -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"9\"\}\r\n$mi_gdb_prompt$" {
-           kfail gdb/2104 "until after while loop (went backwards)"
-       }
-       timeout {
-           fail "until after while loop (timeout)"
-       }
-    }
-
-    send_gdb "222-exec-until 15\n"
-    gdb_expect {
-       -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
-           pass "until line number"
-       }
-       timeout {
-           fail "until line number (timeout)"
-       }
-    }
-
-    send_gdb "333-exec-until until.c:17\n"
-    gdb_expect {
-       -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"17\"\}\r\n$mi_gdb_prompt$" {
-           pass "until line number:file"
-       }
-       timeout {
-           fail "until line number:file (timeout)"
-       }
-    }
+    setup_kfail gdb/2104 "*-*-*"
+    mi_execute_to "exec-until" "end-stepping-range" "foo" "" ".*until.c" "12" "" \
+        "until after while loop"
 
-    # This is supposed to NOT stop at line 25. It stops right after foo is over.
+    mi_execute_to "exec-until 15" "location-reached" "foo" "" ".*until.c" "15" ""\
+        "until line number"
 
-    send_gdb "444-exec-until until.c:25\n"
-    gdb_expect {
-       -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(23|24)\"\}\r\n$mi_gdb_prompt$" {
-           pass "until after current function"
-       }
-       timeout {
-           fail "until after current function (timeout)"
-       }
-    }
+    mi_execute_to "exec-until until.c:17" "location-reached" "foo" "" ".*until.c" "17" ""\
+        "until line number:file"
 
+    # This is supposed to NOT stop at line 25. It stops right after foo is over.
+    mi_execute_to "exec-until until.c:25" "location-reached" "main" "" ".*until.c" "(23|24)" ""\
+        "until after current function"
 }
 
 test_running_to_foo