diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-var-child.c | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-var-child.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi2-var-child.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/var-cmd.c | 8 |
5 files changed, 26 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 296b2cb10e3..74099f60124 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2008-01-17 Pedro Alves <pedro@codesourcery.com> + + * gdb.mi/mi-var-child.c (do_children_tests): Add 'dummy' integer + and 'dummy_ptr' integer pointer. Initialize struct_declarations + with dummy_ptr's address. + * gdb.mi/var-cmd.c (do_children_tests): Likewise. + * gdb.mi/mi-var-child.exp: int_ptr_ptr is now always "editable" on + all targets. + * gdb.mi/mi2-var-child.exp: Likewise. + 2008-01-09 Joel Brobecker <brobecker@adacore.com> * gdb.ada/null_array: New test program. diff --git a/gdb/testsuite/gdb.mi/mi-var-child.c b/gdb/testsuite/gdb.mi/mi-var-child.c index 4912c4f4b96..25aed8b9d20 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child.c +++ b/gdb/testsuite/gdb.mi/mi-var-child.c @@ -206,8 +206,12 @@ do_children_tests (void) int *foo; int bar; - struct _struct_decl struct_declarations; - memset (&struct_declarations, 0, sizeof (struct_declarations)); + /* Avoid pointing into NULL, as that is editable on some + systems. */ + int dummy; + int *dummy_ptr = &dummy; + + struct _struct_decl struct_declarations = { 0, 0, NULL, 0, &dummy_ptr }; weird = &struct_declarations; struct_declarations.integer = 123; diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp index 9099127cc4e..bdb7a1a141b 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi-var-child.exp @@ -682,13 +682,13 @@ mi_gdb_test "-var-show-attributes weird->int_ptr_ptr" \ # Test: c_variable-4.99 # Desc: is *(weird->int_ptr_ptr) editable mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr" \ - "\\^done,attr=\"noneditable\"" \ + "\\^done,attr=\"editable\"" \ "is weird.int_ptr_ptr.*int_ptr_ptr editable" # Test: c_variable-4.100 # Desc: is *(*(weird->int_ptr_ptr)) editable mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr" \ - "\\^done,attr=\"noneditable\"" \ + "\\^done,attr=\"editable\"" \ "is weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr editable" # Test: c_variable-4.101 diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp index d99abec4399..91ada0f8523 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp @@ -681,13 +681,13 @@ mi_gdb_test "-var-show-attributes weird->int_ptr_ptr" \ # Test: c_variable-4.99 # Desc: is *(weird->int_ptr_ptr) editable mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr" \ - "\\^done,attr=\"noneditable\"" \ + "\\^done,attr=\"editable\"" \ "is weird.int_ptr_ptr.*int_ptr_ptr editable" # Test: c_variable-4.100 # Desc: is *(*(weird->int_ptr_ptr)) editable mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr" \ - "\\^done,attr=\"noneditable\"" \ + "\\^done,attr=\"editable\"" \ "is weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr editable" # Test: c_variable-4.101 diff --git a/gdb/testsuite/gdb.mi/var-cmd.c b/gdb/testsuite/gdb.mi/var-cmd.c index 7a4b715e76d..42164617134 100644 --- a/gdb/testsuite/gdb.mi/var-cmd.c +++ b/gdb/testsuite/gdb.mi/var-cmd.c @@ -210,8 +210,12 @@ do_children_tests (void) int *foo; int bar; - struct _struct_decl struct_declarations; - memset (&struct_declarations, 0, sizeof (struct_declarations)); + /* Avoid pointing into NULL, as that is editable on some + systems. */ + int dummy; + int *dummy_ptr = &dummy; + + struct _struct_decl struct_declarations = { 0, 0, NULL, 0, &dummy_ptr }; weird = &struct_declarations; struct_declarations.integer = 123; |