* 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.
This commit is contained in:
Joel Brobecker 2005-02-03 03:58:53 +00:00
parent 11f25ea6ca
commit 464dd14d58
12 changed files with 41 additions and 17 deletions

View File

@ -1,3 +1,20 @@
2005-02-03 Joel Brobecker <brobecker@adacore.com>
* 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 <nickrob@snap.net.nz>
* gdb.base/interp.exp: New test.

View File

@ -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" ;;

View File

@ -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 \

View File

@ -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.*

View File

@ -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" \

View File

@ -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;

View File

@ -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 ]] != "" } {

View File

@ -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