From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27228 invoked by alias); 25 Feb 2008 09:05:13 -0000 Received: (qmail 27198 invoked by uid 22791); 25 Feb 2008 09:05:05 -0000 X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.4) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 25 Feb 2008 09:04:47 +0000 Received: (qmail 5601 invoked from network); 25 Feb 2008 09:04:44 -0000 Received: from unknown (HELO localhost) (vladimir@127.0.0.2) by mail.codesourcery.com with ESMTPA; 25 Feb 2008 09:04:44 -0000 From: Vladimir Prus To: Nick Roberts Subject: Re: (gdb-6.8) Discard breakpoint address if shared library is unloaded Date: Mon, 25 Feb 2008 10:04:00 -0000 User-Agent: KMail/1.9.6 (enterprise 0.20070907.709405) Cc: Joel Brobecker , gdb-patches@sourceware.org References: <20080204214226.GF20922@adacore.com> <18364.32147.39758.99346@kahikatea.snap.net.nz> <200802202325.51341.ghost@cs.msu.su> In-Reply-To: <200802202325.51341.ghost@cs.msu.su> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_pSowHZ5xZUIaLPK" Message-Id: <200802251204.41848.vladimir@codesourcery.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-02/txt/msg00371.txt.bz2 --Boundary-00=_pSowHZ5xZUIaLPK Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 2771 On Wednesday 20 February 2008 23:25:50 Vladimir Prus wrote: > On Wednesday 20 February 2008 22:20:51 Nick Roberts wrote: > > > So how about you submit a complete patch, following the usual protocol > > > rather than an abbreviated one? I'll review it promptly, and we can > > > put this episode behind us. As I said before, I reviewed the breakpoint.c > > > patch and it looked fine, so it's just a matter of taking a look at > > > the testsuite failures and adjust the testsuite accordingly (if > > > justified). > > > > Some or all of the other failures occur in these files: > > > > 2007-09-23 Vladimir Prus > > > > * gdb.base/annota1.exp: Adjust for 'info break' > > format changes. > > * gdb.base/annota3.exp: Likewise. > > * gdb.base/break.exp: Likewise. > > * gdb.base/condbreak.exp: Likewise. > > * gdb.base/pending.exp: Likewise. > > * gdb.base/sepdebug.exp: Likewise. > > * gdb.base/unload.exp: Likewise. > > * gdb.base/ovldbreak.exp: Likewise. > > > > > > So I'm surprised that Vladimir did not know there would be more than those > > in ovldbreak.exp (actually cp.base). > > In my email, I've actually said I did not run the other tests and > there might be more failures. Getting the complete list is only > possible by running the testsuite, since I have no idea what tests were > added since then. > > > It is possible for me to try to understand each of these changes and revert > > them but clearly it is far easier for Vladimir to do that as he made the > > changes in the first place. > > > > I will try to do that but I don't have the time at the moment. > > So, given that we want to release 6.8 soon, and already spent considerable time > on this patch, it looks like I get to pick up where you left. I'll try to > update the test tomorrow. I'm sorry that "tomorrow" did not happen. However, here's a patch with adjusted tests, I don't see any regressions on x86. OK? - Volodya [gdb] 2008-02-15 Nick Roberts * breakpoint.c (print_one_breakpoint_location): Revert Enb field to old format. Discard breakpoint address if shared library is unloaded. (breakpoint_1): Adjust formatting of table header accordingly. [gdb/testsuite] 2008-02-25 Vladimir Prus * gdb.base/annota1.exp: Adjust for 'info break' format changes. * gdb.base/annota3.exp: Likewise. * gdb.base/break.exp: Likewise. * gdb.base/condbreak.exp: Likewise. * gdb.base/pending.exp: Likewise. * gdb.base/sepdebug.exp: Likewise. * gdb.base/unload.exp: Likewise. * gdb.cp/ovldbreak.exp: Likewise. * gdb.mi/mi-pending.exp: Likewise. --Boundary-00=_pSowHZ5xZUIaLPK Content-Type: text/x-diff; charset="iso-8859-1"; name="0001-gdb.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gdb.patch" Content-length: 18112 =46rom d8bc6e9ac200e930858cc192d7b0e674be2baeb9 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 25 Feb 2008 12:02:10 +0300 Subject: [RFA] [gdb] 2008-02-15 Nick Roberts To: gdb-patches@sources.redhat.com X-KMail-Transport: CodeSourcery X-KMail-Identity: 901867920 * breakpoint.c (print_one_breakpoint_location): Revert Enb field to old format. Discard breakpoint address if shared library is unloaded. (breakpoint_1): Adjust formatting of table header accordingly. [gdb/testsuite] 2008-02-25 Vladimir Prus * gdb.base/annota1.exp: Adjust for 'info break' format changes. * gdb.base/annota3.exp: Likewise. * gdb.base/break.exp: Likewise. * gdb.base/condbreak.exp: Likewise. * gdb.base/pending.exp: Likewise. * gdb.base/sepdebug.exp: Likewise. * gdb.base/unload.exp: Likewise. * gdb.cp/ovldbreak.exp: Likewise. * gdb.mi/mi-pending.exp: Likewise. --- gdb/breakpoint.c | 28 +++++++----------------- gdb/testsuite/gdb.base/annota1.exp | 4 +- gdb/testsuite/gdb.base/annota3.exp | 4 +- gdb/testsuite/gdb.base/break.exp | 4 +- gdb/testsuite/gdb.base/condbreak.exp | 2 +- gdb/testsuite/gdb.base/pending.exp | 38 +++++++++++++++++-------------= ---- gdb/testsuite/gdb.base/sepdebug.exp | 4 +- gdb/testsuite/gdb.base/unload.exp | 4 +- gdb/testsuite/gdb.cp/ovldbreak.exp | 6 ++-- gdb/testsuite/gdb.mi/mi-pending.exp | 2 +- 10 files changed, 42 insertions(+), 54 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index dca4ca1..019f4c8 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3426,23 +3426,11 @@ print_one_breakpoint_location (struct breakpoint *b, /* 4 */ annotate_field (3); if (part_of_multiple) - ui_out_field_string (uiout, "enabled",=20 - loc->shlib_disabled=20 - ? (loc->enabled ? "y(p)" : "n(p)") - : (loc->enabled ? "y" : "n")); + ui_out_field_string (uiout, "enabled", loc->enabled ? "y" : "n"); else - { - int pending =3D (b->loc =3D=3D NULL || b->loc->shlib_disabled); - /* For header of multiple, there's no point showing pending - state -- it will be apparent from the locations. */ - if (header_of_multiple) - pending =3D 0; - ui_out_field_fmt (uiout, "enabled", "%c%s",=20 - bpenables[(int) b->enable_state], - pending ? "(p)" : ""); - if (!pending) - ui_out_spaces (uiout, 3); - } + ui_out_field_fmt (uiout, "enabled", "%c",=20 + bpenables[(int) b->enable_state]); + ui_out_spaces (uiout, 2); =20 =20=20=20 /* 5 and 6 */ @@ -3553,10 +3541,10 @@ print_one_breakpoint_location (struct breakpoint *b, if (addressprint) { annotate_field (4); - if (b->loc =3D=3D NULL) - ui_out_field_string (uiout, "addr", ""); - else if (header_of_multiple) + if (header_of_multiple) ui_out_field_string (uiout, "addr", ""); + if (b->loc =3D=3D NULL || loc->shlib_disabled) + ui_out_field_string (uiout, "addr", ""); else ui_out_field_core_addr (uiout, "addr", loc->address); } @@ -3781,7 +3769,7 @@ breakpoint_1 (int bnum, int allflag) ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ if (nr_printable_breakpoints > 0) annotate_field (3); - ui_out_table_header (uiout, 4, ui_left, "enabled", "Enb"); /* 4 */ + ui_out_table_header (uiout, 3, ui_left, "enabled", "Enb"); /* 4 */ if (addressprint) { if (nr_printable_breakpoints > 0) diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/an= nota1.exp index e33aba6..522fdb4 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -117,9 +117,9 @@ gdb_expect { # send_gdb "info break\n"=20 gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\= n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\= 032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddre= ss +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n= \032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbre= akpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\03= 2\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at ${escapedsrcfile}:$= main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\= n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\= 032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddres= s +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\= 032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbrea= kpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\= 032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at ${escapedsrcfile}:$ma= in_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ {pass "breakpoint info"} - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\= n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\= 032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddre= ss +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n= \032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbre= akpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\03= 2\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at .*${srcfile}:$main_= line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\= n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\= 032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddres= s +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\= 032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbrea= kpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\= 032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at .*${srcfile}:$main_li= ne\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ { setup_xfail "*-*-*" 1270 fail "breakpoint info"} -re ".*$gdb_prompt$" { fail "breakpoint info" } diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/an= nota3.exp index 7bb1fe8..2e0595c 100644 --- a/gdb/testsuite/gdb.base/annota3.exp +++ b/gdb/testsuite/gdb.base/annota3.exp @@ -127,8 +127,8 @@ gdb_expect { send_gdb "info break\n"=20 gdb_expect_list "breakpoint info" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "Num Type Disp Enb Address +What\r\n" - "1 breakpoint keep y 0x\[0-9a-zA-Z\]+ +in main at .*annot= a3.c:32\r\n" + "Num Type Disp Enb Address +What\r\n" + "1 breakpoint keep y 0x\[0-9a-zA-Z\]+ +in main at .*annota= 3.c:32\r\n" } =20 =20 diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/brea= k.exp index 6da8203..0ec70c9 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -179,7 +179,7 @@ set bp_location8 [gdb_get_line_number "set breakpoint 8= here" $srcfile1] set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1] =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$main_line.* \[0-9\]+\[\t \]+breakpoint keep y.* in marker2 at .*$srcfile1:($bp_loc= ation8|$bp_location9).* \[0-9\]+\[\t \]+breakpoint keep y.* in factorial$proto at .*$srcfile:$= bp_location7.* @@ -309,7 +309,7 @@ gdb_test "tbreak $srcfile:$bp_location11" "Breakpoint.= *at.* file .*$srcfile, li # # check to see what breakpoints are set (temporary this time) # -gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\] +gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\] \[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$main_line.*\= [\r\n\] \[0-9\]+\[\t \]+breakpoint del.*y.*in factorial$proto at .*$srcfile:$b= p_location7.*\[\r\n\] \[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$bp_location1= .*\[\r\n\] diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/= condbreak.exp index 6f210dc..e76605c 100644 --- a/gdb/testsuite/gdb.base/condbreak.exp +++ b/gdb/testsuite/gdb.base/condbreak.exp @@ -125,7 +125,7 @@ if {$hp_aCC_compiler} { } =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location= 6.* \[0-9\]+\[\t \]+breakpoint keep y.* in marker1$marker1_proto at .*$src= file1:($bp_location15|$bp_location16).* \[\t \]+stop only if \\(1=3D=3D1\\).* diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pe= nding.exp index 464a395..bcca61e 100644 --- a/gdb/testsuite/gdb.base/pending.exp +++ b/gdb/testsuite/gdb.base/pending.exp @@ -71,8 +71,8 @@ gdb_test_multiple "break pendfunc1" "set pending breakpoi= nt" { } =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*pendfunc1.*" \ + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendfunc1.*" \ "single pending breakpoint info" =20 # @@ -86,8 +86,8 @@ gdb_test "break main" \ "breakpoint function" =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*pendfunc1.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendfunc1.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline" \ "pending plus real breakpoint info" =20 @@ -108,8 +108,8 @@ gdb_test_multiple "break pendfunc2" "Don't set pending = breakpoint" { gdb_test "condition 1 k =3D=3D 1" "" =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*pendfunc1.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendfunc1.* \[\t \]+stop only if k =3D=3D 1.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline" \ "pending plus condition" @@ -121,8 +121,8 @@ gdb_test "info break" \ gdb_test "disable 1" "" =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep n\\(p\\).*PENDING.*pendfunc1.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep n.*PENDING.*pendfunc1.* \[\t \]+stop only if k =3D=3D 1.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline" \ "pending disabled" @@ -134,8 +134,8 @@ gdb_test "commands 1\nprint k\nend" "" \ "Set commands for pending breakpoint" =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep n\\(p\\).*PENDING.*pendfunc1.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep n.*PENDING.*pendfunc1.* \[\t \]+stop only if k =3D=3D 1.* \[\t \]+print k.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline" \ @@ -154,12 +154,12 @@ gdb_test_multiple "break pendshr.c:$bp2_loc if x > 3"= "Set pending breakpoint 2" } =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep n\\(p\\).*PENDING.*pendfunc1.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep n.*PENDING.*pendfunc1.* \[\t \]+stop only if k =3D=3D 1.* \[\t \]+print k.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*pendshr.c:$bp2_loc = if x > 3.*" \ +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp2_loc if x > = 3.*" \ "multiple pending breakpoints" =20 =20 @@ -179,13 +179,13 @@ gdb_test {ignore $bpnum 2} "Will ignore next 2 crossi= ngs of breakpoint .*" \ "set ignore count on pending breakpoint 3" =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep n\\(p\\).*PENDING.*pendfunc1.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep n.*PENDING.*pendfunc1.* \[\t \]+stop only if k =3D=3D 1.* \[\t \]+print k.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*pendshr.c:$bp2_loc = if x > 3.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*pendshr.c:$bp3_loc.= *ignore next 2 hits.*" \ +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp2_loc if x > = 3.* +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:$bp3_loc.*ignore= next 2 hits.*" \ "multiple pending breakpoints 2" =20 # @@ -253,7 +253,7 @@ gdb_test_multiple "break imaginary" "set imaginary pend= ing breakpoint" { rerun_to_main =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*imaginary.*" \ +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*imaginary.*" \ "verify pending breakpoint after restart" diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/s= epdebug.exp index cd0d504..54534c6 100644 --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -179,7 +179,7 @@ set bp_location8 [gdb_get_line_number "set breakpoint 8= here"] set bp_location9 [gdb_get_line_number "set breakpoint 9 here"] =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* + "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$main_line.* \[0-9\]+\[\t \]+breakpoint keep y.* in marker2 at .*$srcfile:($bp_loca= tion8|$bp_location9).* \[0-9\]+\[\t \]+breakpoint keep y.* in factorial at .*$srcfile:$bp_loc= ation7.* @@ -298,7 +298,7 @@ gdb_test "tbreak $srcfile:$bp_location11" "Breakpoint.= *at.* file .*$srcfile, li # # check to see what breakpoints are set (temporary this time) # -gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\] +gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\] \[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$main_line.*\= [\r\n\] \[0-9\]+\[\t \]+breakpoint del.*y.*in factorial at .*$srcfile:$bp_loca= tion7.*\[\r\n\] \[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$bp_location1= .*\[\r\n\] diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unl= oad.exp index 55d5ff7..5ce1aaa 100644 --- a/gdb/testsuite/gdb.base/unload.exp +++ b/gdb/testsuite/gdb.base/unload.exp @@ -81,8 +81,8 @@ gdb_test_multiple "break shrfunc1" "set pending breakpoin= t" { } =20 gdb_test "info break" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+breakpoint keep y\\(p\\).*PENDING.*shrfunc1.*" \ + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*shrfunc1.*" \ "single pending breakpoint info" =20 set unloadshr_line [gdb_get_line_number "unloadshr break" ${libsrcfile}] diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovld= break.exp index 7e52ce5..5f66c6e 100644 --- a/gdb/testsuite/gdb.cp/ovldbreak.exp +++ b/gdb/testsuite/gdb.cp/ovldbreak.exp @@ -154,7 +154,7 @@ set_bp_overloaded "foo::overload1arg" "$menu_overload1a= rg" 13 13 110 # Verify the breakpoints. =20 gdb_test "info break" \ - "Num Type\[\t \]+Disp Enb Address\[\t \]+What.* + "Num Type\[\t \]+Disp Enb Address\[\t \]+What.* \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in main at.*$srcf= ile:49\r \[\t \]+breakpoint already hit 1 time\r \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in foo::overload1= arg\\(char\\) at.*$srcfile:111\r @@ -212,7 +212,7 @@ gdb_expect { } =20 gdb_test "info break" \ - "Num Type\[\t \]+Disp Enb Address\[\t \]+What.* + "Num Type\[\t \]+Disp Enb Address\[\t \]+What.* \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in main at.*$srcf= ile:49\r \[\t \]+breakpoint already hit 1 time\r \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in foo::overload1= arg\\(char\\) at.*$srcfile:111\r @@ -291,7 +291,7 @@ gdb_expect { } =20 gdb_test "info break" \ - "Num Type\[\t \]+Disp Enb Address\[\t \]+What.* + "Num Type\[\t \]+Disp Enb Address\[\t \]+What.* \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in foo::overload1= arg\\(double\\) at.*$srcfile:121\r \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in foo::overload1= arg\\(float\\) at.*$srcfile:120\r \[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in foo::overload1= arg\\(unsigned long\\) at.*$srcfile:119\r diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-= pending.exp index ff74bcb..51c7f16 100644 --- a/gdb/testsuite/gdb.mi/mi-pending.exp +++ b/gdb/testsuite/gdb.mi/mi-pending.exp @@ -64,7 +64,7 @@ if [target_info exists gdb_stub] { =20 # Set pending breakpoint via MI mi_gdb_test "-break-insert -f pendfunc1" \ - ".*\\^done,bkpt=3D\{number=3D\"1\",type=3D\"breakpoint\",disp=3D\"keep= \",enabled=3D\"y\\(p\\)\",addr=3D\"\",pending=3D\"pendfunc1\",time= s=3D\"0\"\}"\ + ".*\\^done,bkpt=3D\{number=3D\"1\",type=3D\"breakpoint\",disp=3D\"keep= \",enabled=3D\"y\",addr=3D\"\",pending=3D\"pendfunc1\",times=3D\"0= \"\}"\ "MI pending breakpoint on pendfunc1" =20 mi_run_cmd --=20 1.5.3.5 --Boundary-00=_pSowHZ5xZUIaLPK--