From 9e8e3afe379605b88ca2ab1013a2fa441534232c Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Wed, 26 Mar 2008 13:24:22 +0000 Subject: * lib/mi-support.exp (mi_create_varobj_checked): New. (mi_list_varobj_children): Allow to check for a value. (mi_list_array_varobj_children): New. * gdb.mi/mi-var-child.exp: Use mi_create_varobj and mi_list_varobj_children, as opposed to hardcoding expected strings. * gdb.mi/gdb701.exp: Likewise. * gdb.mi/gdb792.exp: Likewise. * gdb.mi/mi-var-block.exp: Likewise. * gdb.mi/mi-var-cmd.exp: Likewise. * gdb.mi/mi-var-invalidate.exp: Likewise. * gdb.mi/mi2-var-block.exp: Likewise. * gdb.mi/mi2-var-child.exp: Likewise. * gdb.mi/mi2-var-cmd.exp: Likewise. * gdb.mi/mi2-var-display.exp: Likewise. --- gdb/testsuite/gdb.mi/mi2-var-block.exp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'gdb/testsuite/gdb.mi/mi2-var-block.exp') diff --git a/gdb/testsuite/gdb.mi/mi2-var-block.exp b/gdb/testsuite/gdb.mi/mi2-var-block.exp index 063e691..7067c8b 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-block.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-block.exp @@ -44,9 +44,7 @@ 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\",value=\".*\",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\"" \ @@ -66,9 +64,7 @@ mi_gdb_test "-var-delete foo" \ # Test: c_variable-3.3 # Desc: create foo -mi_gdb_test "-var-create foo * foo" \ - "\\^done,name=\"foo\",numchild=\"0\",value=\".*\",type=\"int\"" \ - "create local variable foo" +mi_create_varobj "foo" "foo" "create local variable foo" # step to "foo2 = 123;" mi_step_to "do_block_tests" "" "var-cmd.c" \ @@ -88,9 +84,7 @@ mi_step_to "do_block_tests" "" "var-cmd.c" \ # Test: c_variable-3.5 # Desc: create inner block foo -mi_gdb_test "-var-create inner_foo * foo" \ - "\\^done,name=\"inner_foo\",numchild=\"0\",value=\".*\",type=\"int\"" \ - "create local variable inner_foo" +mi_create_varobj "inner_foo" "foo" "create local variable inner_foo" # step to "foo2 = 0;" mi_step_to "do_block_tests" "" "var-cmd.c" \ @@ -99,9 +93,7 @@ mi_step_to "do_block_tests" "" "var-cmd.c" \ # Test: c_variable-3.6 # Desc: create foo2 -mi_gdb_test "-var-create foo2 * foo2" \ - "\\^done,name=\"foo2\",numchild=\"0\",value=\".*\",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 -- cgit v1.1