From 256e7e85b0e29ada64e573094975cfdc3b7a71f0 Mon Sep 17 00:00:00 2001 From: Angela Marie Thomas Date: Fri, 18 May 2001 05:37:43 +0000 Subject: [PATCH] libstdc++-v3-dg.exp (libstdc++-v3-dg-test): Set output_file based on the name of the testcase. 2001-05-18 Angela Marie Thomas * 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 * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Build gluefile and use it if needs_status_wrapper is set. From-SVN: r42240 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp | 18 ++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a80bdc78212..22e0793c23d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2001-05-18 Angela Marie Thomas + + * 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 + + * 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 * configure.target (ATOMICITYH): Use cpu/generic code on earlier diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index 21729c90d87..978ab012885 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -26,6 +26,8 @@ proc libstdc++-v3-init { args } { global cxx global includes global cxxflags + global objdir + global gluefile wrap_flags set blddir [lookfor_file $outdir libstdc++-v3] set cxx [exec sh ${blddir}/testsuite_flags --build-cxx] @@ -43,6 +45,18 @@ proc libstdc++-v3-init { args } { foreach txt [glob -nocomplain "$srcdir/*/*.txt"] { 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 } { @@ -63,14 +77,14 @@ proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } { } "link" { set compile_type "executable" - set output_file "a.out" + set output_file "./[file rootname [file tail $prog]]" } "run" { set compile_type "executable" # FIXME: "./" is to cope with "." not being in $PATH. # Should this be handled elsewhere? # 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 # created or not. If it was, dg.exp will try to run it. remote_file build delete $output_file; -- 2.30.2