From 345e0682a5eb166666b46b1de1c1effd456424f2 Mon Sep 17 00:00:00 2001
From: drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Apr 2004 14:33:36 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81094 138bc75d-0d04-0410-961f-82ee72b054a4
---
libstdc++-v3/ChangeLog | 6 ++++++
libstdc++-v3/testsuite/lib/libstdc++.exp | 14 +++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 74d29494afb2..ea13da29f21f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+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>
* include/bits/deque.tcc: Trivial formatting fixes.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 8bba2827b242..4e0d86df74a0 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -59,16 +59,16 @@ proc v3track { var n } {
}
# Called by v3-init below. "Static" to this file.
-proc v3-copy-files {srcfiles dstdir} {
+proc v3-copy-files {srcfiles} {
foreach f $srcfiles {
if { [catch { set symlink [file readlink $f] } x] } then {
- file copy -force $f $dstdir
+ remote_download target $f
} else {
if { [regexp "^/" "$symlink"] } then {
- file copy -force $symlink $dstdir
+ remote_download target $symlink
} else {
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} {
# Called once, during runtest.exp setup.
proc libstdc++_init { testfile } {
global env
- global srcdir outdir blddir objdir tool_root_dir
+ global srcdir blddir objdir tool_root_dir
global cxx cxxflags
global includes
global gluefile wrap_flags
@@ -116,8 +116,8 @@ proc libstdc++_init { testfile } {
set dg-do-what-default run
# Copy any required data files.
- v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"] $outdir
- v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"] $outdir
+ v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"]
+ v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"]
# Setup LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found.
# Find the existing LD_LIBRARY_PATH.
--
GitLab