Commit d8fe7b29 by Daniel Jacobowitz Committed by Daniel Jacobowitz

PR libstdc++/15047, libstdc++/11610

	PR libstdc++/15047, libstdc++/11610
	* testsuite/lib/libstdc++.exp (v3-copy-files): Use remote_download.
	(libstdc++_init): Don't pass outdir to v3-copy-files.

From-SVN: r81094
parent 01d4c813
2004-04-23 Daniel Jacobowitz <drow@mvista.com>
PR libstdc++/15047, libstdc++/11610
* testsuite/lib/libstdc++.exp (v3-copy-files): Use remote_download.
(libstdc++_init): Don't pass outdir to v3-copy-files.
2004-04-21 Paolo Carlini <pcarlini@suse.de> 2004-04-21 Paolo Carlini <pcarlini@suse.de>
* include/bits/deque.tcc: Trivial formatting fixes. * include/bits/deque.tcc: Trivial formatting fixes.
......
...@@ -59,16 +59,16 @@ proc v3track { var n } { ...@@ -59,16 +59,16 @@ proc v3track { var n } {
} }
# Called by v3-init below. "Static" to this file. # Called by v3-init below. "Static" to this file.
proc v3-copy-files {srcfiles dstdir} { proc v3-copy-files {srcfiles} {
foreach f $srcfiles { foreach f $srcfiles {
if { [catch { set symlink [file readlink $f] } x] } then { if { [catch { set symlink [file readlink $f] } x] } then {
file copy -force $f $dstdir remote_download target $f
} else { } else {
if { [regexp "^/" "$symlink"] } then { if { [regexp "^/" "$symlink"] } then {
file copy -force $symlink $dstdir remote_download target $symlink
} else { } else {
set dirname [file dirname $f] set dirname [file dirname $f]
file copy -force $dirname/$symlink $dstdir remote_download target $dirname/$symlink
} }
} }
} }
...@@ -77,7 +77,7 @@ proc v3-copy-files {srcfiles dstdir} { ...@@ -77,7 +77,7 @@ proc v3-copy-files {srcfiles dstdir} {
# Called once, during runtest.exp setup. # Called once, during runtest.exp setup.
proc libstdc++_init { testfile } { proc libstdc++_init { testfile } {
global env global env
global srcdir outdir blddir objdir tool_root_dir global srcdir blddir objdir tool_root_dir
global cxx cxxflags global cxx cxxflags
global includes global includes
global gluefile wrap_flags global gluefile wrap_flags
...@@ -116,8 +116,8 @@ proc libstdc++_init { testfile } { ...@@ -116,8 +116,8 @@ proc libstdc++_init { testfile } {
set dg-do-what-default run set dg-do-what-default run
# Copy any required data files. # Copy any required data files.
v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"] $outdir v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"]
v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"] $outdir v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"]
# Setup LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found. # Setup LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found.
# Find the existing LD_LIBRARY_PATH. # Find the existing LD_LIBRARY_PATH.
......
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