From c474c9229e856291e6a88d1e93249e89298bc3ca Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 4 Jan 2008 20:02:29 +0000 Subject: [PATCH] * gdb.ada/tagged/pck.ads, gdb.ada/tagged/pck.adb, gdb.ada/tagged/foo.adb: New file. * gdb.ada/tagged.exp: New testcase. --- gdb/testsuite/ChangeLog | 6 +++ gdb/testsuite/gdb.ada/tagged.exp | 76 ++++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/tagged/foo.adb | 24 ++++++++++++ gdb/testsuite/gdb.ada/tagged/pck.adb | 25 ++++++++++++ gdb/testsuite/gdb.ada/tagged/pck.ads | 32 +++++++++++++++ 5 files changed, 163 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/tagged.exp create mode 100644 gdb/testsuite/gdb.ada/tagged/foo.adb create mode 100644 gdb/testsuite/gdb.ada/tagged/pck.adb create mode 100644 gdb/testsuite/gdb.ada/tagged/pck.ads diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c5f0566..ae908b9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2008-01-04 Joel Brobecker + * gdb.ada/tagged/pck.ads, gdb.ada/tagged/pck.adb, + gdb.ada/tagged/foo.adb: New file. + * gdb.ada/tagged.exp: New testcase. + +2008-01-04 Joel Brobecker + * gdb.ada/ptype_field/pck.ads, gdb.ada/ptype_field/pck.adb, gdb.ada/ptype_field/foo.adb: New files. * gdb.ada/ptype_field.exp: New testcase. diff --git a/gdb/testsuite/gdb.ada/tagged.exp b/gdb/testsuite/gdb.ada/tagged.exp new file mode 100644 index 0000000..981203d --- /dev/null +++ b/gdb/testsuite/gdb.ada/tagged.exp @@ -0,0 +1,76 @@ +# 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 . + +if $tracelevel then { + strace $tracelevel +} + +load_lib "ada.exp" + +set testdir "tagged" +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 +} + +# A convenience function that joins all the arguments together, +# with a regexp that matches zero-or-more end of lines in between +# each argument. This function is ideal to write the expected output +# of a GDB command that generates more than a couple of lines, as +# this allows us to write each line as a separate string, which is +# easier to read by a human being. + +proc multi_line { args } { + return [join $args "\[\r\n\]*"] +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb] +runto "foo.adb:$bp_location" + +# Test printing and type-printing of a tagged type that is not +# class-wide. + +gdb_test "ptype segm" \ + [multi_line "type = new pck\\.object with record" \ + " width: integer;" \ + "end record" ] \ + "ptype segm" + +gdb_test "print segm" \ + "\\(position => 74, width => 8\\)" \ + "print segm" + +# Now, test printing of an class-wide object. + +gdb_test "ptype obj" \ + [multi_line "type = new pck\\.object with record" \ + " width: integer;" \ + "end record" ] \ + "ptype obj" + +gdb_test "print obj" \ + "\\(position => 74, width => 8\\)" \ + "print obj" + + diff --git a/gdb/testsuite/gdb.ada/tagged/foo.adb b/gdb/testsuite/gdb.ada/tagged/foo.adb new file mode 100644 index 0000000..de5f7c1 --- /dev/null +++ b/gdb/testsuite/gdb.ada/tagged/foo.adb @@ -0,0 +1,24 @@ +-- 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 . + +with Pck; use Pck; + +procedure Foo is + Segm : Segment := (Position => 74, Width => 8); + Obj : Object'Class := Segm; +begin + Do_Nothing (Segm'Address); -- START + Do_Nothing (Obj'Address); +end Foo; diff --git a/gdb/testsuite/gdb.ada/tagged/pck.adb b/gdb/testsuite/gdb.ada/tagged/pck.adb new file mode 100644 index 0000000..1d6f2a0 --- /dev/null +++ b/gdb/testsuite/gdb.ada/tagged/pck.adb @@ -0,0 +1,25 @@ +-- 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 . + +package body Pck is + + procedure Do_Nothing (A : System.Address) is + begin + null; + end Do_Nothing; + +end Pck; + + diff --git a/gdb/testsuite/gdb.ada/tagged/pck.ads b/gdb/testsuite/gdb.ada/tagged/pck.ads new file mode 100644 index 0000000..a4b9b90 --- /dev/null +++ b/gdb/testsuite/gdb.ada/tagged/pck.ads @@ -0,0 +1,32 @@ +-- 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 . + +with System; + +package Pck is + + type Object is tagged record + Position : Integer; + end record; + + type Segment is new Object with record + Width : Integer; + end record; + + procedure Do_Nothing (A : System.Address); + +end Pck; + + -- 2.7.4