From: Joel Brobecker Date: Thu, 3 Feb 2005 03:58:53 +0000 (+0000) Subject: * gdb.ada/gnat_ada.gpr: New file. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=464dd14d58f648ec577fda6004708c385e3084a3;p=binutils-gdb.git * gdb.ada/gnat_ada.gpr: New file. * gdb.ada/gnat_ada.gin: Delete, no longer used. * lib/ada.exp (gdb_compile_ada): Minor adaptation to new project file. * configure.ac: No longer generate gnat_ada.gpr. * configure: Regenerate. * gdb.ada/Makefile.in: Minor adaptations due to new project file. * gdb.ada/null_record/null_record.adb: Moved here from gdb.ada. * gdb.ada/null_record/bar.ads: Likewise. * gdb.ada/null_record/bar.adb: Likewise. * gdb.ada/fixed_points/fixed_points.adb: Likewise. * gdb.ada/null_record.exp (testdir): New variable. (testfile): executable is now in testdir subdirectory. (srcfile): Use full path to the main compilation unit. * gdb.ada/fixed_points.exp: Same changes as above. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cba4a92fef4..a67f6320032 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,20 @@ +2005-02-03 Joel Brobecker + + * gdb.ada/gnat_ada.gpr: New file. + * gdb.ada/gnat_ada.gin: Delete, no longer used. + * lib/ada.exp (gdb_compile_ada): Minor adaptation to new project file. + * configure.ac: No longer generate gnat_ada.gpr. + * configure: Regenerate. + * gdb.ada/Makefile.in: Minor adaptations due to new project file. + * gdb.ada/null_record/null_record.adb: Moved here from gdb.ada. + * gdb.ada/null_record/bar.ads: Likewise. + * gdb.ada/null_record/bar.adb: Likewise. + * gdb.ada/fixed_points/fixed_points.adb: Likewise. + * gdb.ada/null_record.exp (testdir): New variable. + (testfile): executable is now in testdir subdirectory. + (srcfile): Use full path to the main compilation unit. + * gdb.ada/fixed_points.exp: Same changes as above. + 2005-02-03 Nick Roberts * gdb.base/interp.exp: New test. diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure index 64498bdeb36..cada180bba8 100755 --- a/gdb/testsuite/configure +++ b/gdb/testsuite/configure @@ -3084,7 +3084,7 @@ done - ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" + ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -3637,7 +3637,6 @@ do # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "gdb.ada/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.ada/Makefile" ;; - "gdb.ada/gnat_ada.gpr" ) CONFIG_FILES="$CONFIG_FILES gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin" ;; "gdb.arch/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.arch/Makefile" ;; "gdb.asm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.asm/Makefile" ;; "gdb.base/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.base/Makefile" ;; diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac index 79d3802f0fb..28605b449fd 100644 --- a/gdb/testsuite/configure.ac +++ b/gdb/testsuite/configure.ac @@ -109,7 +109,7 @@ AC_CHECK_HEADERS(pthread.h) AC_EXEEXT AC_OUTPUT([Makefile \ - gdb.ada/Makefile gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin \ + gdb.ada/Makefile \ gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \ gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \ gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \ diff --git a/gdb/testsuite/gdb.ada/Makefile.in b/gdb/testsuite/gdb.ada/Makefile.in index 1fb20482c85..3d2a99cd42f 100644 --- a/gdb/testsuite/gdb.ada/Makefile.in +++ b/gdb/testsuite/gdb.ada/Makefile.in @@ -1,7 +1,7 @@ VPATH = @srcdir@ srcdir = @srcdir@ -EXECUTABLES = null_record +EXECUTABLES = null_record/null_record fixed_points/fixed_points MISCELLANEOUS = @@ -9,13 +9,16 @@ all info install-info dvi install uninstall installcheck check: @echo "Nothing to be done for $@..." clean mostlyclean: - -gnatclean -Pgnat_ada -q $(EXECUTABLES) + -find . -name '*.o' -print | xargs rm -f + -find . -name '*.ali' -print | xargs rm -f + -find . -name 'b~*.ad[sb]' -print | xargs rm -f + -rm -f *~ a.out xgdb *.x *.ci *.tmp -rm -f *~ *.o a.out xgdb *.x *.ci *.tmp -rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES) -rm -f $(MISCELLANEOUS) twice-tmp.c distclean maintainer-clean realclean: clean -rm -f *~ core - -rm -f Makefile config.status config.log gnat_ada.gpr + -rm -f Makefile config.status config.log -rm -f *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* diff --git a/gdb/testsuite/gdb.ada/bar.adb b/gdb/testsuite/gdb.ada/bar.adb deleted file mode 100644 index 9c751399cb1..00000000000 --- a/gdb/testsuite/gdb.ada/bar.adb +++ /dev/null @@ -1,24 +0,0 @@ --- Copyright 2004 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 2 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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -package body Bar is - - procedure Do_Nothing is - begin - null; - end Do_Nothing; - -end Bar; diff --git a/gdb/testsuite/gdb.ada/bar.ads b/gdb/testsuite/gdb.ada/bar.ads deleted file mode 100644 index c3ca11b06d3..00000000000 --- a/gdb/testsuite/gdb.ada/bar.ads +++ /dev/null @@ -1,23 +0,0 @@ --- Copyright 2004 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 2 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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -package Bar is - - type Empty is null record; - - procedure Do_Nothing; - -end Bar; diff --git a/gdb/testsuite/gdb.ada/fixed_points.adb b/gdb/testsuite/gdb.ada/fixed_points.adb deleted file mode 100644 index 6438efb11c1..00000000000 --- a/gdb/testsuite/gdb.ada/fixed_points.adb +++ /dev/null @@ -1,39 +0,0 @@ --- Copyright 2004 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 2 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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -with System; - -procedure Fixed_Points is - - type Base_Fixed_Point_Type is - delta 1.0 / 16.0 - range (System.Min_Int / 2) * 1.0 / 16.0 .. - (System.Max_Int / 2) * 1.0 / 16.0; - - subtype Fixed_Point_Subtype is - Base_Fixed_Point_Type range -50.0 .. 50.0; - - type New_Fixed_Point_Type is - new Base_Fixed_Point_Type range -50.0 .. 50.0; - - Base_Object : Base_Fixed_Point_Type := -50.0; - Subtype_Object : Fixed_Point_Subtype := -50.0; - New_Type_Object : New_Fixed_Point_Type := -50.0; -begin - Base_Object := 1.0/16.0; -- Set breakpoint here - Subtype_Object := 1.0/16.0; - New_Type_Object := 1.0/16.0; -end Fixed_Points; diff --git a/gdb/testsuite/gdb.ada/fixed_points.exp b/gdb/testsuite/gdb.ada/fixed_points.exp index 9d424e74a43..db47bd3b5c2 100644 --- a/gdb/testsuite/gdb.ada/fixed_points.exp +++ b/gdb/testsuite/gdb.ada/fixed_points.exp @@ -21,8 +21,9 @@ if $tracelevel then { load_lib "ada.exp" -set testfile "fixed_points" -set srcfile ${testfile}.adb +set testdir "fixed_points" +set testfile "${testdir}/fixed_points" +set srcfile ${srcdir}/${subdir}/${testfile}.adb set binfile ${objdir}/${subdir}/${testfile} if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { @@ -34,8 +35,8 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -set bp_location [gdb_get_line_number "Set breakpoint here"] -runto "${srcfile}:$bp_location" +set bp_location [gdb_get_line_number "Set breakpoint here" ${testdir}/fixed_points.adb] +runto "fixed_points.adb:$bp_location" gdb_test "print base_object" \ ".* = -50" \ diff --git a/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb b/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb new file mode 100644 index 00000000000..6438efb11c1 --- /dev/null +++ b/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb @@ -0,0 +1,39 @@ +-- Copyright 2004 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 2 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +with System; + +procedure Fixed_Points is + + type Base_Fixed_Point_Type is + delta 1.0 / 16.0 + range (System.Min_Int / 2) * 1.0 / 16.0 .. + (System.Max_Int / 2) * 1.0 / 16.0; + + subtype Fixed_Point_Subtype is + Base_Fixed_Point_Type range -50.0 .. 50.0; + + type New_Fixed_Point_Type is + new Base_Fixed_Point_Type range -50.0 .. 50.0; + + Base_Object : Base_Fixed_Point_Type := -50.0; + Subtype_Object : Fixed_Point_Subtype := -50.0; + New_Type_Object : New_Fixed_Point_Type := -50.0; +begin + Base_Object := 1.0/16.0; -- Set breakpoint here + Subtype_Object := 1.0/16.0; + New_Type_Object := 1.0/16.0; +end Fixed_Points; diff --git a/gdb/testsuite/gdb.ada/gnat_ada.gin b/gdb/testsuite/gdb.ada/gnat_ada.gin deleted file mode 100644 index 23cd5586dab..00000000000 --- a/gdb/testsuite/gdb.ada/gnat_ada.gin +++ /dev/null @@ -1,27 +0,0 @@ --- Copyright 2004 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 2 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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - --- This project file allows us to control the location where the --- compilation artifacts produced when building the Ada examples --- are stored. - -project Gnat_Ada is - - for Source_Dirs use ("@srcdir@"); - -- No need to set the Object_Dir, it is set to "." by default - -- (which means the same directory as this project file). - -end Gnat_Ada; diff --git a/gdb/testsuite/gdb.ada/gnat_ada.gpr b/gdb/testsuite/gdb.ada/gnat_ada.gpr new file mode 100644 index 00000000000..7c01ae27273 --- /dev/null +++ b/gdb/testsuite/gdb.ada/gnat_ada.gpr @@ -0,0 +1,26 @@ +-- Copyright 2004 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 2 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +-- This project file allows us to control the location where the +-- compilation artifacts produced when building the Ada examples +-- are stored. + +project Gnat_Ada is + + for Source_Dirs use (external ("SRC")); + for Object_Dir use external ("OBJ"); + +end Gnat_Ada; diff --git a/gdb/testsuite/gdb.ada/null_record.adb b/gdb/testsuite/gdb.ada/null_record.adb deleted file mode 100644 index 260b3d66097..00000000000 --- a/gdb/testsuite/gdb.ada/null_record.adb +++ /dev/null @@ -1,23 +0,0 @@ --- Copyright 2004 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 2 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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -with Bar; use Bar; - -procedure Null_Record is -begin - Do_Nothing; -end Null_Record; - diff --git a/gdb/testsuite/gdb.ada/null_record.exp b/gdb/testsuite/gdb.ada/null_record.exp index 8956e9f76c7..1989d0b3e2d 100644 --- a/gdb/testsuite/gdb.ada/null_record.exp +++ b/gdb/testsuite/gdb.ada/null_record.exp @@ -21,8 +21,9 @@ if $tracelevel then { load_lib "ada.exp" -set testfile "null_record" -set srcfile ${testfile}.adb +set testdir "null_record" +set testfile "${testdir}/null_record" +set srcfile ${srcdir}/${subdir}/${testfile}.adb set binfile ${objdir}/${subdir}/${testfile} if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { diff --git a/gdb/testsuite/gdb.ada/null_record/bar.adb b/gdb/testsuite/gdb.ada/null_record/bar.adb new file mode 100644 index 00000000000..9c751399cb1 --- /dev/null +++ b/gdb/testsuite/gdb.ada/null_record/bar.adb @@ -0,0 +1,24 @@ +-- Copyright 2004 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 2 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +package body Bar is + + procedure Do_Nothing is + begin + null; + end Do_Nothing; + +end Bar; diff --git a/gdb/testsuite/gdb.ada/null_record/bar.ads b/gdb/testsuite/gdb.ada/null_record/bar.ads new file mode 100644 index 00000000000..c3ca11b06d3 --- /dev/null +++ b/gdb/testsuite/gdb.ada/null_record/bar.ads @@ -0,0 +1,23 @@ +-- Copyright 2004 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 2 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +package Bar is + + type Empty is null record; + + procedure Do_Nothing; + +end Bar; diff --git a/gdb/testsuite/gdb.ada/null_record/null_record.adb b/gdb/testsuite/gdb.ada/null_record/null_record.adb new file mode 100644 index 00000000000..260b3d66097 --- /dev/null +++ b/gdb/testsuite/gdb.ada/null_record/null_record.adb @@ -0,0 +1,23 @@ +-- Copyright 2004 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 2 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +with Bar; use Bar; + +procedure Null_Record is +begin + Do_Nothing; +end Null_Record; + diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 3bd8e29c4b5..647114ae14b 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -409,12 +409,16 @@ if {[info procs find_gnatmake] == ""} { proc gdb_compile_ada {source dest type options} { + set srcdir [file dirname $source] + set gprdir [file dirname $srcdir] set objdir [file dirname $dest] append options " ada" - append options " additional_flags=-P$objdir/gnat_ada" + append options " additional_flags=-P$gprdir/gnat_ada" + append options " additional_flags=-XSRC=[file tail $srcdir]" + append options " additional_flags=-XOBJ=$objdir" - set result [target_compile $source $dest $type $options] + set result [target_compile [file tail $source] $dest $type $options] # The Ada build always produces some output, even when the build # succeeds. Thus, we can not use the output the same way we do in