* gdb.ada/fun_in_declare/pck.ads, gdb.ada/fun_in_declare/pck.adb,

        gdb.ada/fun_in_declare/foo.adb: New files.
        * gdb.ada/fun_in_declare.exp: New testcase.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b1b469d0ad902f9bf72c95979deb719a913e95d7..73d2bc2a11aa300c96360d654b8624b136e44233 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-01  Joel Brobecker  <brobecker@adacore.com>
+
+       * gdb.ada/fun_in_declare/pck.ads, gdb.ada/fun_in_declare/pck.adb,
+       gdb.ada/fun_in_declare/foo.adb: New files.
+       * gdb.ada/fun_in_declare.exp: New testcase. 
+
 2008-01-01  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.ada/ref_param/foo.adb, gdb.ada/ref_param/pck.adb,

diff --git a/gdb/testsuite/gdb.ada/fun_in_declare.exp b/gdb/testsuite/gdb.ada/fun_in_declare.exp
new file mode 100644 (file)
index 0000000..fa450a0
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/fun_in_declare.exp
@@ -0,0 +1,55 @@
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+load_lib "ada.exp"
+
+set testdir "fun_in_declare"
+set testfile "${testdir}/foo"
+set srcfile ${srcdir}/${subdir}/${testfile}.adb
+set binfile ${objdir}/${subdir}/${testfile}
+
+file mkdir ${objdir}/${subdir}/${testdir}
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+  return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if ![runto main] then {
+  perror "Couldn't run ${testfile}"
+  return
+} 
+
+# Some variables used to simplify the maintenance of some of
+# the regular expressions below.
+set any_nb "\[0-9\]+"
+set any_addr "0x\[0-9a-zA-Z\]+"
+
+set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
+gdb_test "break foo.adb:$bp_location" \
+         "Breakpoint $any_nb at $any_addr: file .*foo.adb, line $any_nb." \
+         "insert breakpoint inside foo.call_me"
+
+gdb_test "continue" \
+         ".*Breakpoint $any_nb, foo\\.call_me \\(\\) at .*foo.adb:$any_nb.*" \
+         "decoding of function name"
+

diff --git a/gdb/testsuite/gdb.ada/fun_in_declare/foo.adb b/gdb/testsuite/gdb.ada/fun_in_declare/foo.adb
new file mode 100644 (file)
index 0000000..6f264f3
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/fun_in_declare/foo.adb
@@ -0,0 +1,28 @@
+--  Copyright 2008 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+with Pck; use Pck;
+
+procedure Foo is
+begin
+   declare
+      procedure Call_Me is
+      begin
+         Do_Nothing; -- STOP
+      end Call_Me;
+   begin
+      Call_Me;
+   end;
+end Foo;

diff --git a/gdb/testsuite/gdb.ada/fun_in_declare/pck.adb b/gdb/testsuite/gdb.ada/fun_in_declare/pck.adb
new file mode 100644 (file)
index 0000000..e791b43
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/fun_in_declare/pck.adb
@@ -0,0 +1,21 @@
+--  Copyright 2008 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package body Pck is
+   procedure Do_Nothing is
+   begin
+      null;
+   end Do_Nothing;
+end Pck;

diff --git a/gdb/testsuite/gdb.ada/fun_in_declare/pck.ads b/gdb/testsuite/gdb.ada/fun_in_declare/pck.ads
new file mode 100644 (file)
index 0000000..a1a97ad
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/fun_in_declare/pck.ads
@@ -0,0 +1,18 @@
+--  Copyright 2008 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package Pck is
+   procedure Do_Nothing;
+end Pck;