From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28510 invoked by alias); 27 Apr 2005 21:47:56 -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 27928 invoked from network); 27 Apr 2005 21:47:34 -0000 Received: from unknown (HELO e31.co.us.ibm.com) (32.97.110.129) by sourceware.org with SMTP; 27 Apr 2005 21:47:34 -0000 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e31.co.us.ibm.com (8.12.10/8.12.9) with ESMTP id j3RLlXua496716 for ; Wed, 27 Apr 2005 17:47:34 -0400 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id j3RLlXYg210914 for ; Wed, 27 Apr 2005 15:47:33 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id j3RLlWSQ019949 for ; Wed, 27 Apr 2005 15:47:33 -0600 Received: from dyn9047022123-009047022128.beaverton.ibm.com (dyn9047022123-009047022128.beaverton.ibm.com [9.47.22.128]) by d03av01.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id j3RLlWlX019903; Wed, 27 Apr 2005 15:47:32 -0600 From: Paul Gilliam Reply-To: pgilliam@us.ibm.com To: gdb-patches@sources.redhat.com Subject: [COMMIT] Fixes testsuit/gdb.base/annota1.exp to deal with 'Breakpoint address adjusted' Date: Wed, 27 Apr 2005 21:47:00 -0000 User-Agent: KMail/1.6.2 Cc: Daniel Jacobowitz References: <200504071025.11668.pgilliam@us.ibm.com> <200504151638.04458.pgilliam@us.ibm.com> <20050427154312.GC7765@nevyn.them.org> In-Reply-To: <20050427154312.GC7765@nevyn.them.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200504271449.18641.pgilliam@us.ibm.com> X-SW-Source: 2005-04/txt/msg00378.txt.bz2 Here is the patch I commited. -=# Paul #=- 2005-04-27 Paul Gilliam * gdb.base/annota1.exp : Deal with messages caused by breakpoints in shared objects being adjusted and update copyright. Index: gdb.base/annota1.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v retrieving revision 1.16 diff -c -3 -p -r1.16 annota1.exp *** gdb.base/annota1.exp 20 Jul 2004 00:24:41 -0000 1.16 --- gdb.base/annota1.exp 27 Apr 2005 21:38:32 -0000 *************** *** 1,4 **** ! # Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 1,4 ---- ! # Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** send_gdb "break printf\n" *** 229,234 **** --- 229,236 ---- gdb_expect { -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \ { pass "breakpoint printf" } + -re "\r\n\032\032post-prompt\r\nwarning: Breakpoint address adjusted from $hex to $hex.\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \ + { pass "breakpoint printf"} -re ".*$gdb_prompt$" { fail "break printf" } timeout { fail "break printf (timeout)" } } *************** send_gdb "continue\n" *** 240,245 **** --- 242,250 ---- gdb_expect { -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*\032\032frame-function-name\r\nprintf\r\n\032\032frame-args\r\n.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ { pass "continue to printf" } + -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\nwarning: Breakpoint 3 address previously adjusted from $hex to $hex.\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*.*\032\032frame-function-name\r\n.printf\r\n\032\032frame-args\r\n.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ + { pass "continue to printf" } + -re ".*$gdb_prompt$" { fail "continue to printf" } timeout { fail "continue to printf (timeout)" } }