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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44866 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9ff18df..437ecf6 100644 (file)
--- 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  <gdr@merlin.codesourcery.com>
 
        * 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 bb7b8cb..6250403 100644 (file)
--- 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]