2005-07-04 Mark Mitchell <mark@codesourcery.com>

* Makefile.am (site.exp): Set tmpdir.
        * Makefile.in: Regenerated.
        * testsuite/lib/checkoutput.exp (newlib_check_output): Put
        executables in $tmpdir.
        * testsuite/lib/flags.exp (libgloss_link_flags): Use the original
        libgloss version if not running in the build directory.
        * testsuite/lib/newlib.exp (newlib_init): Put testglue.o in
        $tmpdir.
        * testsuite/lib/passfail.exp (newlib_pass_fail): Put executables
        in $tmpdir.
This commit is contained in:
Jeff Johnston
2005-07-05 00:11:50 +00:00
parent 0740b418fc
commit cec1d3b414
7 changed files with 51 additions and 8 deletions

View File

@ -9,10 +9,10 @@
# It assumes one line of output per test.
proc newlib_check_output { srcfile expectlist } {
global objdir subdir srcdir
global subdir srcdir tmpdir
set srcfullname "$srcdir/$subdir/$srcfile"
set test_driver "$objdir/testsuite/[file tail [file rootname $srcfullname].x]"
set test_driver "$tmpdir/[file tail [file rootname $srcfullname].x]"
set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""]

View File

@ -12,12 +12,20 @@
# directories, rather than in the build and source paths of the
# compiler being used.
if {![llength [info procs saved_libgloss_link_flags]]} {
rename libgloss_link_flags saved_libgloss_link_flags
}
proc libgloss_link_flags { args } {
global target_cpu
# These values come from the local site.exp.
global srcdir objdir
global multibuildtop
if {![info exists multibuildtop]} {
return [saved_libgloss_link_flags $args]
}
verbose "In newlib version of libgloss_link_flags...\n"
if [isnative] {

View File

@ -23,7 +23,7 @@ proc newlib_init { args } {
global newlib_initialized
global target_info
# These values are initialized in the local site.exp file.
global srcdir objdir
global srcdir objdir tmpdir
global host_triplet target_triplet
global old_ld_library_path
@ -34,7 +34,7 @@ proc newlib_init { args } {
if {[target_info needs_status_wrapper] != "" && \
[target_info needs_status_wrapper] != "0" && \
![info exists gluefile]} {
set gluefile ${objdir}/testsuite/testglue.o;
set gluefile ${tmpdir}/testglue.o;
set result [build_wrapper $gluefile];
if { $result != "" } {
set gluefile [lindex $result 0];

View File

@ -32,11 +32,11 @@ proc newlib_pass_fail_all { flag exclude_list } {
# compiles and runs.
proc newlib_pass_fail { srcfile } {
global srcdir objdir subdir
global srcdir tmpdir subdir
set fullsrcfile "$srcdir/$subdir/$srcfile"
set test_driver "$objdir/testsuite/[file rootname $srcfile].x"
set test_driver "$tmpdir/[file rootname $srcfile].x"
set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""]