Commit 256e7e85 by Angela Marie Thomas Committed by Benjamin Kosnik

libstdc++-v3-dg.exp (libstdc++-v3-dg-test): Set output_file based on the name of the testcase.


2001-05-18  Angela Marie Thomas <angela@cygnus.com>

        * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-dg-test):  Set
        output_file based on the name of the testcase.

2001-05-18  Angela Marie Thomas <angela@cygnus.com>

        * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init):  Build
        gluefile and use it if needs_status_wrapper is set.

From-SVN: r42240
parent 9c233cb3
2001-05-18 Angela Marie Thomas <angela@cygnus.com>
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-dg-test): Set
output_file based on the name of the testcase.
2001-05-18 Angela Marie Thomas <angela@cygnus.com>
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Build
gluefile and use it if needs_status_wrapper is set.
2001-05-18 Alexandre Oliva <aoliva@redhat.com> 2001-05-18 Alexandre Oliva <aoliva@redhat.com>
* configure.target (ATOMICITYH): Use cpu/generic code on earlier * configure.target (ATOMICITYH): Use cpu/generic code on earlier
......
...@@ -26,6 +26,8 @@ proc libstdc++-v3-init { args } { ...@@ -26,6 +26,8 @@ proc libstdc++-v3-init { args } {
global cxx global cxx
global includes global includes
global cxxflags global cxxflags
global objdir
global gluefile wrap_flags
set blddir [lookfor_file $outdir libstdc++-v3] set blddir [lookfor_file $outdir libstdc++-v3]
set cxx [exec sh ${blddir}/testsuite_flags --build-cxx] set cxx [exec sh ${blddir}/testsuite_flags --build-cxx]
...@@ -43,6 +45,18 @@ proc libstdc++-v3-init { args } { ...@@ -43,6 +45,18 @@ proc libstdc++-v3-init { args } {
foreach txt [glob -nocomplain "$srcdir/*/*.txt"] { foreach txt [glob -nocomplain "$srcdir/*/*.txt"] {
file copy -force $txt $outdir file copy -force $txt $outdir
} }
if { [target_info needs_status_wrapper]!="" && ![info exists gluefile] } {
set gluefile ${objdir}/testglue.o;
set result [build_wrapper $gluefile];
if { $result != "" } {
set gluefile [lindex $result 0];
set wrap_flags [lindex $result 1];
} else {
unset gluefile
}
}
} }
proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } { proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } {
...@@ -63,14 +77,14 @@ proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } { ...@@ -63,14 +77,14 @@ proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } {
} }
"link" { "link" {
set compile_type "executable" set compile_type "executable"
set output_file "a.out" set output_file "./[file rootname [file tail $prog]]"
} }
"run" { "run" {
set compile_type "executable" set compile_type "executable"
# FIXME: "./" is to cope with "." not being in $PATH. # FIXME: "./" is to cope with "." not being in $PATH.
# Should this be handled elsewhere? # Should this be handled elsewhere?
# YES. # YES.
set output_file "./a.out" set output_file "./[file rootname [file tail $prog]]"
# This is the only place where we care if an executable was # This is the only place where we care if an executable was
# created or not. If it was, dg.exp will try to run it. # created or not. If it was, dg.exp will try to run it.
remote_file build delete $output_file; remote_file build delete $output_file;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment