From 3f78692f4a18555218035e70af3d9b31251bbfcc Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 24 Dec 2009 21:57:06 +0000 Subject: [PATCH] gdb/testsuite/ Fix compatibility with G++-4.5. * gdb.cp/expand-sals.cc (main): Remove the "exit-line" comment. * gdb.cp/expand-sals.exp: Remove breakpoint on "exit-line". (uncaught return): Remove. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cp/expand-sals.cc | 2 +- gdb/testsuite/gdb.cp/expand-sals.exp | 6 ------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 86abd127a7c..8aef477daac 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-12-24 Jan Kratochvil + + Fix compatibility with G++-4.5. + * gdb.cp/expand-sals.cc (main): Remove the "exit-line" comment. + * gdb.cp/expand-sals.exp: Remove breakpoint on "exit-line". + (uncaught return): Remove. + 2009-12-23 Jan Kratochvil Phil Muldoon diff --git a/gdb/testsuite/gdb.cp/expand-sals.cc b/gdb/testsuite/gdb.cp/expand-sals.cc index 6169a05dabe..e83cd163f7e 100644 --- a/gdb/testsuite/gdb.cp/expand-sals.cc +++ b/gdb/testsuite/gdb.cp/expand-sals.cc @@ -49,5 +49,5 @@ main (void) A a; B b; - return 0; /* exit-line */ + return 0; } diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp index 3c302c31321..741e7bc1888 100644 --- a/gdb/testsuite/gdb.cp/expand-sals.exp +++ b/gdb/testsuite/gdb.cp/expand-sals.exp @@ -23,8 +23,6 @@ if ![runto_main] { return -1 } -gdb_breakpoint [gdb_get_line_number "exit-line"] - gdb_breakpoint [gdb_get_line_number "func-line"] gdb_continue_to_breakpoint "func" ".*func-line.*" @@ -52,7 +50,3 @@ gdb_test "bt" \ "bt from A" gdb_continue_to_breakpoint "next caller func" ".*func-line.*" - -# Verify GDB really could not catch any other breakpoint location. - -gdb_continue_to_breakpoint "uncaught return" ".*exit-line.*" -- 2.30.2