From 7db19937237a4ae5d1cae179a1614f3294c9d3cc Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 13 Aug 2001 20:43:13 +0000 Subject: [PATCH] libstdc++-v3-dg.exp (libstdc++-v3-copy-files): New. 2001-08-13 H.J. Lu (hjl@gnu.org) * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-copy-files): New. Copy files. (libstdc++-v3-init ): Use it. From-SVN: r44866 --- libstdc++-v3/ChangeLog | 6 +++++ .../testsuite/lib/libstdc++-v3-dg.exp | 23 ++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9ff18df9887..437ecf686f2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2001-08-13 H.J. Lu (hjl@gnu.org) + + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-copy-files): + New. Copy files. + (libstdc++-v3-init ): Use it. + 2001-08-13 Gabriel Dos Reis * include/bits/ostream.tcc (__pad_char): Change toplevel '__fmt' diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index bb7b8cb6c4c..6250403f433 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -19,6 +19,21 @@ load_lib dg.exp load_lib libgloss.exp +proc libstdc++-v3-copy-files {srcfiles dstdir} { + foreach f $srcfiles { + if { [catch { set symlink [file readlink $f] } x] } then { + file copy -force $f $dstdir + } else { + if { [regexp "^/" "$symlink"] } then { + file copy -force $symlink $dstdir + } else { + set dirname [file dirname $f] + file copy -force $dirname/$symlink $dstdir + } + } + } +} + proc libstdc++-v3-init { args } { global srcdir global outdir @@ -37,12 +52,8 @@ proc libstdc++-v3-init { args } { set dg-do-what-default run # Copy any required data files. - foreach tst [glob -nocomplain "$srcdir/*/*.tst"] { - file copy -force $tst $outdir - } - foreach txt [glob -nocomplain "$srcdir/*/*.txt"] { - file copy -force $txt $outdir - } + libstdc++-v3-copy-files [glob -nocomplain "$srcdir/*/*.tst"] $outdir + libstdc++-v3-copy-files [glob -nocomplain "$srcdir/*/*.txt"] $outdir # set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found. set gccpath [get_multilibs] -- 2.30.2