diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/code_elim.exp | 48 |
2 files changed, 34 insertions, 24 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f253f41..f82ce3f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -11,6 +11,16 @@ (get address of my_global_func, get address of main): Wrap them to 'order1' and 'order2'. + * gdb.base/code_elim.exp + (add-symbol-file ${testfile1} 0x100000) + (add-symbol-file ${testfile2} 0x200000): Wrap them to 'order1' and + 'order2'. + (order1: add-symbol-file ${testfile1} 0x100000) + (order1: add-symbol-file ${testfile2} 0x200000) + (order2: add-symbol-file ${testfile2} 0x200000) + (order2: add-symbol-file ${testfile1} 0x100000): Add -s .data and -s + .bss as appropriate. + 2012-05-28 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.server/solib-list-lib.c: New file. diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/code_elim.exp index cd7dab6..9779534 100644 --- a/gdb/testsuite/gdb.base/code_elim.exp +++ b/gdb/testsuite/gdb.base/code_elim.exp @@ -128,19 +128,19 @@ with_test_prefix "single symtabs" { gdb_exit gdb_start -gdb_test "add-symbol-file ${binfile1} 0x100000" \ - "Reading symbols from .*${testfile1}\\.\\.\\.done\\." \ - "add-symbol-file ${testfile1} 0x100000" \ - "add symbol table from file \".*${testfile1}\" at\[ \t\r\n\]+\.text_addr = 0x100000\[\r\n\]+\\(y or n\\) " \ - "y" - -gdb_test "add-symbol-file ${binfile2} 0x200000" \ - "Reading symbols from .*${testfile2}\\.\\.\\.done\\." \ - "add-symbol-file ${testfile2} 0x200000" \ - "add symbol table from file \".*${testfile2}\" at\[ \t\r\n\]+\.text_addr = 0x200000\[\r\n\]+\\(y or n\\) " \ - "y" - with_test_prefix "order1" { + gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \ + "Reading symbols from .*${testfile1}\\.\\.\\.done\\." \ + "add-symbol-file ${testfile1} 0x100000" \ + "add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \ + "y" + + gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .bss 0x220000" \ + "Reading symbols from .*${testfile2}\\.\\.\\.done\\." \ + "add-symbol-file ${testfile2} 0x200000" \ + "add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \ + "y" + not_null_var_address my_global_symbol not_null_var_address my_static_symbol not_null_var_address my_global_func @@ -152,19 +152,19 @@ with_test_prefix "order1" { gdb_exit gdb_start -gdb_test "add-symbol-file ${binfile2} 0x200000" \ - "Reading symbols from .*${testfile2}\\.\\.\\.done\\." \ - "add-symbol-file ${testfile2} 0x200000" \ - "add symbol table from file \".*${testfile2}\" at\[ \t\r\n\]+\.text_addr = 0x200000\[\r\n\]+\\(y or n\\) " \ - "y" - -gdb_test "add-symbol-file ${binfile1} 0x100000" \ - "Reading symbols from .*${testfile1}\\.\\.\\.done\\." \ - "add-symbol-file ${testfile1} 0x100000" \ - "add symbol table from file \".*${testfile1}\" at\[ \t\r\n\]+\.text_addr = 0x100000\[\r\n\]+\\(y or n\\) " \ - "y" - with_test_prefix "order2" { + gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .bss 0x220000" \ + "Reading symbols from .*${testfile2}\\.\\.\\.done\\." \ + "add-symbol-file ${testfile2} 0x200000" \ + "add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \ + "y" + + gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \ + "Reading symbols from .*${testfile1}\\.\\.\\.done\\." \ + "add-symbol-file ${testfile1} 0x100000" \ + "add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \ + "y" + not_null_var_address my_global_symbol not_null_var_address my_static_symbol not_null_var_address my_global_func |