From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21452 invoked by alias); 29 Jul 2002 22:45:58 -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 21435 invoked from network); 29 Jul 2002 22:45:56 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 29 Jul 2002 22:45:56 -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 g6TMXjl17049 for ; Mon, 29 Jul 2002 18:33:45 -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 g6TMFou17536 for ; Mon, 29 Jul 2002 18:15:50 -0400 Received: from romulus.sfbay.redhat.com (IDENT:uuMG/HVSAeZIAgSn5HBn/rGL0FAlN8oF@romulus.sfbay.redhat.com [172.16.27.251]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id g6TMFnj20598 for ; Mon, 29 Jul 2002 15:15:49 -0700 Received: (from kev@localhost) by romulus.sfbay.redhat.com (8.11.6/8.11.6) id g6TMFlf11555 for gdb-patches@sources.redhat.com; Mon, 29 Jul 2002 15:15:47 -0700 Date: Mon, 29 Jul 2002 15:54:00 -0000 From: Kevin Buettner Message-Id: <1020729221547.ZM11554@localhost.localdomain> To: gdb-patches@sources.redhat.com Subject: [RFA] gdb.base/shlib-call.exp changes for IRIX MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-07/txt/msg00567.txt.bz2 Some more IRIX related changes. I can break this change up into two parts if necessary. (The linker flag change is probably reasonably obvious, but the change to the "step out of shr2" test should be reviewed.) 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 (additional_flags): Add linker flags so that shared libraries created by test will be found. (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.5 diff -u -p -r1.5 shlib-call.exp --- testsuite/gdb.base/shlib-call.exp 18 Apr 2002 21:07:20 -0000 1.5 +++ testsuite/gdb.base/shlib-call.exp 29 Jul 2002 21:37:35 -0000 @@ -103,6 +103,8 @@ if { ($gcc_compiled && ([istarget "powerpc*-*-aix*"] || [istarget "rs6000*-*-aix*"] )) } { set additional_flags "additional_flags=-L${objdir}/${subdir}" +} elseif { [istarget "mips-sgi-irix*"] } { + set additional_flags "additional_flags=-rpath ${objdir}/${subdir}" } else { set additional_flags "" } @@ -234,18 +236,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"