diff options
| author | David Carlton <carlton@bactrian.org> | 2002-10-11 22:23:08 +0000 |
|---|---|---|
| committer | David Carlton <carlton@bactrian.org> | 2002-10-11 22:23:08 +0000 |
| commit | 6ef1ea4da8422faa48256d3ee48aea8331eefe85 (patch) | |
| tree | 40cf38e1e2fde2176e50954a5c04bdc73e2d7ff5 /gdb/testsuite/gdb.base | |
| parent | 2ff07d9e7c3dcfc9e26f32eb307d56a1a32480b9 (diff) | |
| download | gdb-6ef1ea4da8422faa48256d3ee48aea8331eefe85.tar.gz | |
Merge with mainline; merge tag carlton_dictionary-20021011-merge.
Diffstat (limited to 'gdb/testsuite/gdb.base')
| -rw-r--r-- | gdb/testsuite/gdb.base/annota1.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/shlib-call.exp | 27 |
2 files changed, 19 insertions, 10 deletions
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index bda2bec3975..e4483e3b471 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -115,7 +115,7 @@ gdb_expect { # send_gdb "info break\n" gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbreakpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at ${srcdir}/${subdir}/${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbreakpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at (${srcdir}/${subdir}/)?${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ {pass "breakpoint info"} -re ".*$gdb_prompt$" { fail "breakpoint info" } timeout { fail "breakpoint info (timeout)" } diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index dd88274d1be..8fe8b22da39 100644 --- a/gdb/testsuite/gdb.base/shlib-call.exp +++ b/gdb/testsuite/gdb.base/shlib-call.exp @@ -239,18 +239,27 @@ gdb_expect { #step -return send_gdb "step\n" + # A step at this point will either take us entirely out of + # the function or into the function's epilogue. The exact + # behavior will differ depending upon upon whether or not + # the compiler emits line number information for the epilogue. gdb_expect { - -re ".*\\\}.*$gdb_prompt $" { pass "step inside shr2 (shlib func)"} - -re ".*$gdb_prompt $" { fail "step inside shr2 (shlib func)" } - timeout { fail "step inside shr2 (shlib func) (timeout)" } - } - - send_gdb "step\n" - gdb_expect { - -re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" { pass "step out of shr2 to main"} - -re ".*$gdb_prompt $" { fail "step out of shr2 to main" } + -re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" { + pass "step out of shr2 to main" + } + -re ".*\\\}.*$gdb_prompt $" { + pass "step out of shr2 to main (stopped in shr2 epilogue)" + send_gdb "step\n" + gdb_expect { + -re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" { pass "step out of shr2 epilogue to main"} + -re ".*$gdb_prompt $" { fail "step out of shr2 epilogue to main" } + timeout { fail "step out of shr2 epilogue to main (timeout)" } + } + } + -re ".*$gdb_prompt $" { fail "step out of shr2" } timeout { fail "step out of shr2 to main (timeout)" } } + #print mainshr1(1) send_gdb "print mainshr1(1)\n" |