This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


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

Fixes for remote testing


Could someone apply this patch please? Previously the ecos.exp drivers were
broken for remote testing. Hopefully this should fix it although I'm not in
a position to try it(!) I have tested non-remote testing though so we're
definitely no worse off than before.

Jifl

2001-09-28  Jonathan Larmour  <jlarmour@redhat.com>

	* gcc.dg/special/ecos.exp: Take into account remote hosts.
	* g++.dg/special/ecos.exp: Likewise


-- 
Red Hat, Rustat House, Clifton Road, Cambridge, UK. Tel: +44 (1223) 271062
Maybe this world is another planet's Hell -Aldous Huxley || Opinions==mine
Index: gcc.dg/special/ecos.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/special/ecos.exp,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ecos.exp
--- ecos.exp	2001/01/18 02:30:03	1.6
+++ ecos.exp	2001/09/28 18:37:41
@@ -13,18 +13,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
 # Please email any bugs, comments, and/or additions to this file to:
-# jlarmour@cygnus.co.uk
+# jlarmour@redhat.com
 
-# This file was written by Jonathan Larmour (jlarmour@cygnus.co.uk).
+# This file was written by Jonathan Larmour (jlarmour@redhat.com).
 
 # GCC testsuite that uses the `dg.exp' driver.
 
 # Load support procs.
 load_lib gcc-dg.exp
+load_lib remote.exp
 
 ###############################
 # proc gcc_target_object_format {}
 ###############################
 # has been moved to:  gcc/testsuite/lib/file-format.exp
@@ -43,12 +44,13 @@ if { [ check_weak_available ] == 1 } {
 
     set lines [gcc_target_compile "$srcdir/$subdir/weak-1a.c" "weak-1a.o" object ""]
     if ![string match "" $lines] then {
         fail "weak-1a.o"
     } else {
+        remote_download host weak-1a.o
         dg-runtest "$srcdir/$subdir/weak-1.c" "weak-1a.o" "" 
-        file delete weak-1a.o
+        file_on_host delete weak-1a.o
     }
     dg-finish
 } elseif { [ check_weak_available ] == 0 } {
     unsupported "weak-1.c"
 } else {
@@ -68,12 +70,14 @@ if { [ check_weak_available ] == 1 } {
     } else {
         set lines [gcc_target_compile "$srcdir/$subdir/weak-2b.c" "weak-2b.o" object ""]
         if ![string match "" $lines] then {
             fail "weak-2b.o"
         } else {
+            remote_download host weak-2a.o
+            remote_download host weak-2b.o
             dg-runtest "$srcdir/$subdir/weak-2.c" "weak-2a.o weak-2b.o" "" 
-            file delete weak-2a.o weak-2b.o
+            file_on_host delete weak-2a.o weak-2b.o
         }
     }
     dg-finish
 } elseif { [ check_weak_available ] == 0 } {
     unsupported "weak-2.c"
@@ -120,12 +124,14 @@ if { [ check_weak_available ] == 1 } {
 	    xfail "wkali-2b.o"
 	    file delete $srcdir/$subdir/a.out
         } elseif ![string match "" $lines] then {
             fail "wkali-2b.o"
         } else {
+            remote_download host wkali-2a.o
+            remote_download host wkali-2b.o
             dg-runtest "$srcdir/$subdir/wkali-2.c" "wkali-2a.o wkali-2b.o" ""
-            file delete wkali-2a.o wkali-2b.o
+            file_on_host delete wkali-2a.o wkali-2b.o
         }
     }
     dg-finish
 } elseif { [ check_weak_available ] == 0 } {
     unsupported "wkali-2.c"
Index: g++.dg/special/ecos.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/g++.dg/special/ecos.exp,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ecos.exp
--- ecos.exp	2001/08/19 21:00:30	1.7
+++ ecos.exp	2001/09/28 18:37:41
@@ -13,18 +13,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 # Please email any bugs, comments, and/or additions to this file to:
-# jlarmour@cygnus.co.uk
+# jlarmour@redhat.com
 
-# This file was written by Jonathan Larmour (jlarmour@cygnus.co.uk).
+# This file was written by Jonathan Larmour (jlarmour@redhat.com).
 
 # G++ testsuite that uses the `dg.exp' driver.
 
 # Load support procs.
 load_lib g++-dg.exp
+load_lib remote.exp
 
 ###########
 # conpr-1.C
 ###########
 
@@ -52,12 +53,13 @@ set lines [g++_target_compile "$srcdir/$
 if [string match "*init_priority*" $lines] then {
     xfail "conpr-2a.o"
 } elseif ![string match "" $lines] then {
     fail "conpr-2a.o"
 } else {
+    remote_download host conpr-2a.o
     dg-runtest "$srcdir/$subdir/conpr-2.C" "conpr-2a.o" "" 
-    file delete conpr-2a.o
+    file_on_host delete conpr-2a.o
 }
 dg-finish
 
 
 ###########
@@ -74,14 +76,16 @@ if [string match "*init_priority*" $line
 } else {
     set lines [g++_target_compile "$srcdir/$subdir/conpr-3b.C" "conpr-3b.o" object ""]
     if ![string match "" $lines] then {
         fail "conpr-3b.o"
     } else {
+        remote_download host conpr-3a.o
+        remote_download host conpr-3b.o
         # run it with objects both ways around!
         dg-runtest "$srcdir/$subdir/conpr-3.C" "conpr-3a.o conpr-3b.o" ""
         dg-runtest "$srcdir/$subdir/conpr-3.C" "conpr-3b.o conpr-3a.o" ""
-        file delete conpr-3a.o conpr-3b.o
+        file_on_host delete conpr-3a.o conpr-3b.o
     }
 }
 dg-finish
 
 ###########

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