This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

libstdc++-v3 remote testing, partial fix


As discussed with Phil and Dan Kegel earlier today.  If we use
remote_download instead of file copy, then DejaGNU will arrange to use rcp
to the target when necessary.  This will drop the files in the testsuite's
idea of the "current directory", which will be the testsuite directory on
native/sim or the remote home directory over rsh.

Tested on arm-linux cross (with rsh) and i686-linux native.  Fixes all but
two of my libstdc++ failures for the arm-linux cross - quite nice!  OK?

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

2004-04-21  Daniel Jacobowitz  <drow@mvista.com>

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

Index: libstdc++-v3/testsuite/lib/libstdc++.exp
===================================================================
RCS file: /big/fsf/rsync/gcc-cvs/gcc/libstdc++-v3/testsuite/lib/libstdc++.exp,v
retrieving revision 1.19
diff -u -p -r1.19 libstdc++.exp
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp	4 Mar 2004 23:29:43 -0000	1.19
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp	21 Apr 2004 16:11:07 -0000
@@ -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.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]