[commit] testsuite: Fix gdb.cp/expand-sals.exp for G++-4.5

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

Hi,

with G++-4.5 this testcase turns PASS->FAIL:

-Breakpoint 2, main () at ./gdb.cp/expand-sals.cc:52
-52       return 0;     /* exit-line */
-(gdb) PASS: gdb.cp/expand-sals.exp: continue to breakpoint: uncaught return
+Breakpoint 4, 0x00000000004004f7 in A (this=0x7fffffffd14e) at ./gdb.cp/expand-sals.cc:33
+33           global_x = func ();       /* caller-line */
+(gdb) FAIL: gdb.cp/expand-sals.exp: continue to breakpoint: uncaught return

It is because G++ no longer produces two instances of the A::A constructor but
just one - PR c++/3187.  Therefore previously uncaught PC is being caught now.

As this testcase was just a verifiction and the real regression tested there
is an internal error on "break" case above this one I just dropped it.

Checked-in as obvious, also this testcase was there from me.


Regards,
Jan


http://sourceware.org/ml/gdb-cvs/2009-12/msg00128.html

--- src/gdb/testsuite/ChangeLog	2009/12/23 23:18:08	1.2054
+++ src/gdb/testsuite/ChangeLog	2009/12/24 21:57:06	1.2055
@@ -1,3 +1,10 @@
+2009-12-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	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  <jan.kratochvil@redhat.com>
 	    Phil Muldoon  <pmuldoon@redhat.com>
 
--- src/gdb/testsuite/gdb.cp/expand-sals.cc	2009/05/11 15:05:56	1.1
+++ src/gdb/testsuite/gdb.cp/expand-sals.cc	2009/12/24 21:57:06	1.2
@@ -49,5 +49,5 @@
   A a;
   B b;
 
-  return 0;	/* exit-line */
+  return 0;
 }
--- src/gdb/testsuite/gdb.cp/expand-sals.exp	2009/05/11 15:05:56	1.1
+++ src/gdb/testsuite/gdb.cp/expand-sals.exp	2009/12/24 21:57:06	1.2
@@ -23,8 +23,6 @@
     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 @@
 	 "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.*"