* mi/mi-interp.c (mi_solib_loaded, mi_solib_unloaded): New.
[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.mi / mi-var-block.exp
index 0b9ebc32d73a8aa77fa361d02dd0956c0fdecd3e..d8298685c15863ef5a1f7287ee1532e478cac337 100644 (file)
@@ -1,8 +1,9 @@
-#   Copyright (C) 1999 2000 s Solutions
+# Copyright 1999, 2000, 2001, 2002, 2004, 2007, 2008, 2009
+# Free Software Foundation, Inc.
 #
-# This Program Is Free software; you can redistribute it and/or modify
+# 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,
 # 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
 #
@@ -35,109 +32,68 @@ set testfile "var-cmd"
 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 mi-var-block.exp
+    return -1
 }
 
 mi_delete_breakpoints
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
-mi_gdb_test "200-break-insert do_block_tests" \
-       "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_block_tests\",file=\".*var-cmd.c\",line=\"154\",times=\"0\"\}" \
-       "break-insert operation"
-
-mi_run_cmd
-# The running part has been checked already by mi_run_cmd
-gdb_expect {
-    -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"154\"\}\r\n$mi_gdb_prompt$" {
-       pass "run to do_block_tests"
-    }
-    -re ".*$mi_gdb_prompt$" {fail "run to do_block_tests (2)"}
-    timeout {fail "run to do_block_tests (timeout 2)"}
-}
+mi_runto do_block_tests
 
 # Test: c_variable-3.2
 # Desc: create cb and foo
-mi_gdb_test "-var-create cb * cb" \
-       "\\^done,name=\"cb\",numchild=\"0\",type=\"int\"" \
-       "create local variable cb"
+mi_create_varobj "cb" "cb" "create local variable cb"
 
 mi_gdb_test "-var-create foo * foo" \
-       "&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-       "create local variable foo"
+       "\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
+       "try to create local variable foo"
 
 # step to "foo = 123;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"158\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_block_tests"
-    }
-    timeout {
-       fail "step at do_block_tests (timeout)"
-    }
-}
+mi_step_to "do_block_tests" "" "var-cmd.c" \
+    [gdb_get_line_number "foo = 123;"] \
+    "step at do_block_test"
 
 
 # Be paranoid and assume 3.2 created foo
 mi_gdb_test "-var-delete foo" \
-       "&\"Variable object not found\\\\n\".*\\^error,msg=\"Variable object not found\"" \
+       "\\^error,msg=\"Variable object not found\"" \
        "delete var foo"
 
 
 # Test: c_variable-3.3
 # Desc: create foo
-mi_gdb_test "-var-create foo * foo" \
-       "\\^done,name=\"foo\",numchild=\"0\",type=\"int\"" \
-       "create local variable foo"
+mi_create_varobj "foo" "foo" "create local variable foo"
 
 # step to "foo2 = 123;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"161\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_block_tests"
-    }
-    timeout {
-       fail "step at do_block_tests (timeout)"
-    }
-}
+mi_step_to "do_block_tests" "" "var-cmd.c" \
+    [gdb_get_line_number "foo2 = 123;"] \
+    "step at do_block_test"
 
 # Test: c_variable-3.4
 # Desc: check foo, cb changed
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"foo\",in_scope=\"true\",type_changed=\"false\",name=\"cb\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"foo\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"cb\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
        "update all vars: cb foo changed"
 
 # step to "foo = 321;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"164\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_block_tests"
-    }
-    timeout {
-       fail "step at do_block_tests (timeout)"
-    }
-}
+mi_step_to "do_block_tests" "" "var-cmd.c" \
+    [gdb_get_line_number "foo = 321;"] \
+    "step at do_block_test"
 
 # Test: c_variable-3.5
 # Desc: create inner block foo
-mi_gdb_test "-var-create inner_foo * foo" \
-       "\\^done,name=\"inner_foo\",numchild=\"0\",type=\"int\"" \
-       "create local variable inner_foo"
+mi_create_varobj "inner_foo" "foo" "create local variable inner_foo"
 
 # step to "foo2 = 0;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"166\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_block_tests"
-    }
-    timeout { fail "step at do_block_tests (timeout)" }
-}
+mi_step_to "do_block_tests" "" "var-cmd.c" \
+    [gdb_get_line_number "foo2 = 0;"] \
+    "step at do_block_test"
 
 # Test: c_variable-3.6
 # Desc: create foo2
-mi_gdb_test "-var-create foo2 * foo2" \
-       "\\^done,name=\"foo2\",numchild=\"0\",type=\"int\"" \
-       "create local variable foo2"
+mi_create_varobj "foo2" "foo2" "create local variable foo2"
 
 # Test: c_variable-3.7
 # Desc: check that outer foo in scope and inner foo out of scope
@@ -155,7 +111,7 @@ mi_gdb_test "-var-evaluate-expression inner_foo" \
 clear_xfail *-*-*
 
 mi_gdb_test "-var-update foo" \
-       "\\^done,changelist=\{\}" \
+       "\\^done,changelist=\\\[\\\]" \
        "update foo: did not change"
 
 mi_gdb_test "-var-delete inner_foo" \
@@ -163,13 +119,9 @@ mi_gdb_test "-var-delete inner_foo" \
        "delete var inner_foo"
 
 # step to "foo = 0;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"168\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_block_tests"
-    }
-    timeout { fail "step at do_block_tests (timeout)" }
-}
+mi_step_to "do_block_tests" "" "var-cmd.c" \
+    [gdb_get_line_number "foo = 0;"] \
+    "step at do_block_test"
 
 # Test: c_variable-3.8
 # Desc: check that foo2 out of scope (known gdb problem)
@@ -180,20 +132,15 @@ mi_gdb_test "-var-update foo2" \
 clear_xfail *-*-*
 
 # step to "cb = 21;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"171\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_block_tests"
-    }
-    timeout { fail "step at do_block_tests (timeout)" }
-}
-
+mi_step_to "do_block_tests" "" "var-cmd.c" \
+    [gdb_get_line_number "cb = 21;"] \
+    "step at do_block_test"
 
 # Test: c_variable-3.9
 # Desc: check that only cb is in scope (known gdb problem)
 setup_xfail *-*-*
 mi_gdb_test "-var-update foo2" \
-       "\\^done,changelist=\{FIXME\}" \
+       "\\^done,changelist=\\\[FIXME\\\]" \
        "update foo2 should be out of scope: KNOWN PROBLEM"
 clear_xfail *-*-*
 setup_xfail *-*-*
@@ -202,7 +149,7 @@ mi_gdb_test "-var-update foo" \
        "update foo should be out of scope: KNOWN PROBLEM"
 clear_xfail *-*-*
 mi_gdb_test "-var-update cb" \
-       "\\^done,changelist=\{\}" \
+       "\\^done,changelist=\\\[\\\]" \
        "update cb"
 
 # Test: c_variable-3.10
@@ -226,9 +173,3 @@ mi_gdb_test "-var-delete cb" \
 
 mi_gdb_exit
 return 0
-
-# Local variables: 
-# change-log-default-name: "ChangeLog-mi"
-# End:
-
-
This page took 0.029489 seconds and 4 git commands to generate.