diff options
| author | Tom Tromey <tromey@redhat.com> | 2010-12-15 21:19:50 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2010-12-15 21:19:50 +0000 |
| commit | 5b79abe7f19d73ff246909922f3c2da2af689779 (patch) | |
| tree | 8142c32892796da119dac7e1a546c9fe16160d48 /gdb/testsuite | |
| parent | 8bdf35dcae2506a183214562484f24b4aaffe3ab (diff) | |
| download | gdb-5b79abe7f19d73ff246909922f3c2da2af689779.zip gdb-5b79abe7f19d73ff246909922f3c2da2af689779.tar.gz gdb-5b79abe7f19d73ff246909922f3c2da2af689779.tar.bz2 | |
gdb
* infrun.c (save_infcall_control_state): Handle the
exception-resume breakpoint.
(restore_infcall_control_state): Likewise.
(discard_infcall_control_state): Likewise.
gdb/testsuite
2010-12-15 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.cp/nextoverthrow.cc (dummy): Return int 0.
(NextOverThrowDerivates) <resumebpt>: New.
(resumebpt_test): New.
(main): Call resumebpt_test.
* gdb.cp/nextoverthrow.exp: New block for test of "resumebpt".
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/nextoverthrow.cc | 36 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/nextoverthrow.exp | 11 |
3 files changed, 52 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0417538..9947918 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-12-15 Jan Kratochvil <jan.kratochvil@redhat.com> + + * gdb.cp/nextoverthrow.cc (dummy): Return int 0. + (NextOverThrowDerivates) <resumebpt>: New. + (resumebpt_test): New. + (main): Call resumebpt_test. + * gdb.cp/nextoverthrow.exp: New block for test of "resumebpt". + 2010-12-12 Stan Shebs <stan@codesourcery.com> * gdb.trace/tsv.exp: Test print command on trace state variables. diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.cc b/gdb/testsuite/gdb.cp/nextoverthrow.cc index b25cb34..b618f15 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.cc +++ b/gdb/testsuite/gdb.cp/nextoverthrow.cc @@ -19,8 +19,9 @@ using namespace std; -void dummy () +int dummy () { + return 0; } class NextOverThrowDerivates @@ -89,10 +90,39 @@ public: function1 (val); // until here } + void resumebpt (int val) + { + try + { + throw val; + } + catch (int x) + { + dummy (); + } + } + }; NextOverThrowDerivates next_cases; +int +resumebpt_test (int x) +{ + try + { + next_cases.resumebpt (x); // Start: resumebpt + next_cases.resumebpt (x + 1); // Second: resumebpt + } + catch (int val) + { + dummy (); + x = val; + } + + return x; +} + int main () { int testval = -1; @@ -198,6 +228,8 @@ int main () testval = val; // End: advance } + // Test of "resumebpt". + testval = resumebpt_test (10); + testval = 32; // done } - diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp index 960ea0d..3ec51f7 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.exp +++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp @@ -149,5 +149,14 @@ gdb_test "advance $line" ".*" "advance-over-throw" tbreak_and_cont "End: advance" verify_testval "pre-check - advance" 8 +tbreak_and_cont "Start: resumebpt" +gdb_test "tbreak _Unwind_RaiseException" +gdb_test "continue" "Temporary breakpoint.*" "continuing to _Unwind_RaiseException" +gdb_test "finish" "Run till exit .*" +gdb_test {set $retpc=$pc} +gdb_test {break *$retpc if dummy ()} +tbreak_and_cont "Second: resumebpt" +gdb_test "next" + tbreak_and_cont "done" -verify_testval "post-check - advance" 9 +verify_testval "post-check - advance" 10 |