From 464dd14d58f648ec577fda6004708c385e3084a3 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 3 Feb 2005 03:58:53 +0000 Subject: [PATCH] * 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. --- gdb/testsuite/ChangeLog | 17 +++++++++++++++++ gdb/testsuite/configure | 3 +-- gdb/testsuite/configure.ac | 2 +- gdb/testsuite/gdb.ada/Makefile.in | 9 ++++++--- gdb/testsuite/gdb.ada/fixed_points.exp | 9 +++++---- .../gdb.ada/{ => fixed_points}/fixed_points.adb | 0 gdb/testsuite/gdb.ada/{gnat_ada.gin => gnat_ada.gpr} | 5 ++--- gdb/testsuite/gdb.ada/null_record.exp | 5 +++-- gdb/testsuite/gdb.ada/{ => null_record}/bar.adb | 0 gdb/testsuite/gdb.ada/{ => null_record}/bar.ads | 0 gdb/testsuite/gdb.ada/{ => null_record}/null_record.adb | 0 gdb/testsuite/lib/ada.exp | 8 ++++++-- 12 files changed, 41 insertions(+), 17 deletions(-) rename gdb/testsuite/gdb.ada/{ => fixed_points}/fixed_points.adb (100%) rename gdb/testsuite/gdb.ada/{gnat_ada.gin => gnat_ada.gpr} (85%) rename gdb/testsuite/gdb.ada/{ => null_record}/bar.adb (100%) rename gdb/testsuite/gdb.ada/{ => null_record}/bar.ads (100%) rename gdb/testsuite/gdb.ada/{ => null_record}/null_record.adb (100%) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cba4a92..a67f632 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 64498bd..cada180 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 79d3802..28605b4 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 1fb2048..3d2a99c 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/fixed_points.exp b/gdb/testsuite/gdb.ada/fixed_points.exp index 9d424e7..db47bd3 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.adb b/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb similarity index 100% rename from gdb/testsuite/gdb.ada/fixed_points.adb rename to gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb diff --git a/gdb/testsuite/gdb.ada/gnat_ada.gin b/gdb/testsuite/gdb.ada/gnat_ada.gpr similarity index 85% rename from gdb/testsuite/gdb.ada/gnat_ada.gin rename to gdb/testsuite/gdb.ada/gnat_ada.gpr index 23cd558..7c01ae2 100644 --- a/gdb/testsuite/gdb.ada/gnat_ada.gin +++ b/gdb/testsuite/gdb.ada/gnat_ada.gpr @@ -20,8 +20,7 @@ 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). + for Source_Dirs use (external ("SRC")); + for Object_Dir use external ("OBJ"); end Gnat_Ada; diff --git a/gdb/testsuite/gdb.ada/null_record.exp b/gdb/testsuite/gdb.ada/null_record.exp index 8956e9f..1989d0b 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/bar.adb b/gdb/testsuite/gdb.ada/null_record/bar.adb similarity index 100% rename from gdb/testsuite/gdb.ada/bar.adb rename to gdb/testsuite/gdb.ada/null_record/bar.adb diff --git a/gdb/testsuite/gdb.ada/bar.ads b/gdb/testsuite/gdb.ada/null_record/bar.ads similarity index 100% rename from gdb/testsuite/gdb.ada/bar.ads rename to gdb/testsuite/gdb.ada/null_record/bar.ads diff --git a/gdb/testsuite/gdb.ada/null_record.adb b/gdb/testsuite/gdb.ada/null_record/null_record.adb similarity index 100% rename from gdb/testsuite/gdb.ada/null_record.adb rename to gdb/testsuite/gdb.ada/null_record/null_record.adb diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 3bd8e29..647114a 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 -- 2.7.4