* gdb.base/recurse.exp: When checking leaving the watchpoint

        scope, recognize when gdb is in function's epilogue and pass.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 48ba2f0764f7ec95b95cdc36e04518a8d59deea7..679fdf2491342a928620601d5abd90886a3d7b2e 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-19  Corinna Vinschen  <vinschen@redhat.com>
+
+       * gdb.base/recurse.exp: When checking leaving the watchpoint
+       scope, recognize when gdb is in function's epilogue and pass.
+
 2001-09-18  Keith Seitz  <keiths@redhat.com>
 
        * lib/insight-support.exp (_gdbtk_export_target_info): Add

diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp
index 957f9497f0b96c532c93a76fe94bb2f6a654fe0b..bd1ecee60d95f1a7cc40e22128c0a6eb7af57aaa 100644 (file)
--- a/gdb/testsuite/gdb.base/recurse.exp
+++ b/gdb/testsuite/gdb.base/recurse.exp
@@ -123,9 +123,30 @@ proc recurse_tests {} {
            gdb_suppress_tests
        }
 
-       # Continue again.  We should have a watchpoint go out of scope now
+       # Continue again.  We should have a watchpoint go out of scope now.
+       #
+       # The former version expected the test to return to main().
+       # Now it expects the test to return to main or to stop in the
+       # function's epilogue.
+       # 
+       # The problem is that gdb needs to (but doesn't) understand
+       # function epilogues in the same way as for prologues.
+       # 
+       # If there is no hardware watchpoint (such as a x86 debug register),
+       # then watchpoints are done "the hard way" by single-stepping the
+       # target until the value of the watched variable changes.  If you
+       # are single-stepping, you will eventually step into an epilogue.
+       # When you do that, the "top" stack frame may become partially
+       # deconstructed (as when you pop the frame pointer, for instance),
+       # and from that point on, GDB can no longer make sense of the stack.
+       # 
+       # A test which stops in the epilogue is trying to determine when GDB
+       # leaves the stack frame in which the watchpoint was created.  It does
+       # this basically by watching for the frame pointer to change.  When
+       # the frame pointer changes, the test expects to be back in main, but
+       # instead it is still in the epilogue of the callee.
        if [gdb_test "continue" \
-           "Continuing.*\[Ww\]atchpoint.*deleted.*main \\(\\) .*" \
+           "Continuing.*\[Ww\]atchpoint.*deleted.*\(main \\(\\) \|21.*\}\).*" \
            "first instance watchpoint deleted when leaving scope"] then {
            gdb_suppress_tests;
        }