-Index: gdb/testsuite/ChangeLog
-2005-01-21 Jeff Johnston <jjohnstn@redhat.com>
-
- * gdb.cp/constructortest.exp: New test.
- * gdb.cp/constructortest.cc: Ditto.
- * gdb.cp/templates.exp: Change break of dtor to be fully quoted.
-
-2007-09-22 Jan Kratochvil <jan.kratochvil@redhat.com>
-
- * gdb.cp/constructortest.exp, gdb.cp/constructortest.cc: Test also the
- `$delete' destructor variant.
-
-2007-09-25 Jan Kratochvil <jan.kratochvil@redhat.com>
-
- * gdb.cp/constructortest.exp: Delete the FIXME workaround of restarting
- the whole GDB.
-
-2007-10-05 Jan Kratochvil <jan.kratochvil@redhat.com>
-
- * gdb.cp/constructortest.exp: Test BREAKPOINT_RE_SET for multiple PCs
- by PIE.
- * gdb.cp/constructortest.exp: Handle the change of settings breakpoints
- always at all the ctor/dtor variants.
-
-[ Removed the `gdb.cp/templates.exp' patch. ]
-[ Updated the patch for "(X location") of GDB-6.8+. ]
-
---- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc.fix Fri Jan 21 17:06:56 2005
-+++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc Fri Jan 21 17:05:18 2005
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc 2011-12-19 22:05:02.825431735 +0100
@@ -0,0 +1,99 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+{
+ y = 2; /* First line D */
+}
---- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp.fix Fri Jan 21 17:07:02 2005
-+++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp Fri Jan 21 17:05:29 2005
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp 2011-12-19 23:07:24.148290893 +0100
@@ -0,0 +1,130 @@
+# This testcase is part of GDB, the GNU debugger.
+
+set define_line_dtor [gdb_get_line_number "Destructor C"]
+# Break on the various forms of the C::~C destructor
+# " ([23] locations)" is displayed depending on G++ version.
-+gdb_test "break C\:\:~C" "Breakpoint .*, line ($define_line_dtor|$define_line_dtor)\\..*" "breaking on C::~C"
++gdb_test "break C\:\:~C" "Breakpoint .*: C::~C\\. \\(2 locations\\)" "breaking on C::~C"
+gdb_continue_to_breakpoint "First line ~C"
+
+# Verify that we can break by line number in a destructor and find