From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31473 invoked by alias); 30 Jul 2002 19:09:48 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 31464 invoked from network); 30 Jul 2002 19:09:46 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 30 Jul 2002 19:09:46 -0000 Received: from int-mx2.corp.redhat.com (nat-pool-rdu.redhat.com [172.16.52.200] (may be forged)) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id g6UIvUl02466 for ; Tue, 30 Jul 2002 14:57:30 -0400 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id g6UJ9iu25403 for ; Tue, 30 Jul 2002 15:09:45 -0400 Received: from romulus.sfbay.redhat.com (IDENT:zrAPAvbKggjYGwAZbx0e05WNkP0IGQQ+@romulus.sfbay.redhat.com [172.16.27.251]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id g6UJ9hm26644 for ; Tue, 30 Jul 2002 12:09:44 -0700 Received: (from kev@localhost) by romulus.sfbay.redhat.com (8.11.6/8.11.6) id g6UJ9gg16442 for gdb-patches@sources.redhat.com; Tue, 30 Jul 2002 12:09:42 -0700 Date: Tue, 30 Jul 2002 12:12:00 -0000 From: Kevin Buettner Message-Id: <1020730190942.ZM16441@localhost.localdomain> To: gdb-patches@sources.redhat.com Subject: [RFA/resubmit] shlib-call.exp: stepping out... MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-07/txt/msg00599.txt.bz2 This is a resubmission of http://sources.redhat.com/ml/gdb-patches/2002-07/msg00566.html The current patch (below) is identical to the previous patch with the exception that the "obvious" portion has been committed (and therefore no longer shows up in the patch). Here's what I said about this patch in my previous post: Anyway, regarding the "step out of shr2" test changes, the IRIX compiler doesn't emit line number information for the epilogue, so we don't see the step onto the final ``}'' of the function. I don't see a problem with this behavior. I've revised the test to accept either behavior. I've also revised the messages a little bit to account for the restructuring of the test. Okay to commit? * gdb.base/shlib-call.exp (step inside shr2): Don't fail if first step ends up stepping out of the function instead of stopping on the epilogue. Index: testsuite/gdb.base/shlib-call.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/shlib-call.exp,v retrieving revision 1.6 diff -u -p -r1.6 shlib-call.exp --- testsuite/gdb.base/shlib-call.exp 30 Jul 2002 18:51:23 -0000 1.6 +++ testsuite/gdb.base/shlib-call.exp 30 Jul 2002 18:56:55 -0000 @@ -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"