ab8314b3d9
The current approach when building Ada programs for testing is
based on the use of a project file (testsuite/gdb.ada/gnat_ada.gpr).
To do that, we pass a number of additional arguments to target_compile,
one of them being the project file (via "-P/path/to/gnat_ada.gpr").
This used to work well-enough, but AdaCore is currently working towards
removing project-file support from gnatmake (the prefered tool for
using project files is gprbuild). So, we need to either switch
the compilation to gprbuild, or stop using project files.
First, using gprbuild is not always what users will be using to
build their applications. So having the option of using gnatmake
provides more flexibility towards exactly reproducing past bugs.
If we ever need a testcase that requires the use of gprbuild, then
I believe support for a new target needs to be added to dejagnu's
target_compile.
Also, the only real reason behind using a project file in the first
place is that we wanted to make it easy to specify the directory
where all compilation artifacts get stored. This is a consequence
of the organization choice we made for gdb.ada to keep each testcase
well organized. It is very easy to achieve that goal without using
project files.
This is therefore what this patch does: It change gdb_compile_ada
to build any program using gnatmake without using a project file
(by temporarily changing the current working directory).
There is a small (beneficial) side-effect; in the situation where
GDB is built in-tree, gnatmake is called as...
% gnatmake [...] unit.adb
... which means that the debugging info in unit.o will say contain
a filename whose name is 'unit.adb', rather than '/path/to/unit.adb'.
This also better matches what users might typically do. But the side-
effect is that the unit name in the GDB output is not always a full
path. This patch tweaks a couple of testcases to make the path part
optional.
gdb/testsuite:
* lib/ada.exp (target_compile_ada_from_dir): New function.
(gdb_compile_ada): Reimplement avoiding the use of project files.
* gdb.ada/gnat_ada.gpr: Delete.
* gdb.ada/cond_lang.exp: Adjust test to make path before
filename optional.
* gdb.ada/small_reg_param.exp: Likewise.
Tested on x86_64-linux, with both in-tree and out-of-tree builds.
81 lines
3 KiB
Text
81 lines
3 KiB
Text
# Copyright 2004-2015 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/>.
|
|
|
|
# Call target_compile with SOURCE DEST TYPE and OPTIONS as argument,
|
|
# after having temporarily changed the current working directory to
|
|
# BUILDDIR.
|
|
|
|
proc target_compile_ada_from_dir {builddir source dest type options} {
|
|
set saved_cwd [pwd]
|
|
catch {
|
|
cd $builddir
|
|
return [target_compile $source $dest $type $options]
|
|
} result options
|
|
cd $saved_cwd
|
|
return -options $options $result
|
|
}
|
|
|
|
# Compile some Ada code.
|
|
|
|
proc gdb_compile_ada {source dest type options} {
|
|
|
|
set srcdir [file dirname $source]
|
|
set gprdir [file dirname $srcdir]
|
|
set objdir [file dirname $dest]
|
|
|
|
# Although strictly not necessary, we force the recompilation
|
|
# of all units (additional_flags=-f). This is what is done
|
|
# when using GCC to build programs in the other languages,
|
|
# and it avoids using a stray objfile file from a long-past
|
|
# run, for instance.
|
|
append options " ada"
|
|
append options " additional_flags=-f"
|
|
append options " additional_flags=-I$srcdir"
|
|
|
|
set result [target_compile_ada_from_dir \
|
|
$objdir [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
|
|
# gdb_compile to determine whether the build has succeeded or not.
|
|
# We therefore simply check whether the dest file has been created
|
|
# or not. Unless not present, the build has succeeded.
|
|
if [file exists $dest] { set result "" }
|
|
gdb_compile_test $source $result
|
|
return $result
|
|
}
|
|
|
|
# Like standard_testfile, but for Ada. Historically the Ada tests
|
|
# used a different naming convention from many of the other gdb tests,
|
|
# and this difference was preserved during the conversion to
|
|
# standard_testfile. DIR defaults to the base name of the test case;
|
|
# but can be overridden to find sources in a different subdirectory of
|
|
# gdb.ada.
|
|
|
|
proc standard_ada_testfile {base_file {dir ""}} {
|
|
global gdb_test_file_name srcdir subdir
|
|
global testdir testfile srcfile binfile
|
|
|
|
if {$dir == ""} {
|
|
set testdir $gdb_test_file_name
|
|
} else {
|
|
set testdir $dir
|
|
}
|
|
set testfile $testdir/$base_file
|
|
set srcfile $srcdir/$subdir/$testfile.adb
|
|
set binfile [standard_output_file $testfile]
|
|
|
|
file mkdir [standard_output_file $testdir]
|
|
}
|