old-dejagnu.exp (old-dejagnu): Copy extra source files to the host if it is remote.

	* lib/old-dejagnu.exp (old-dejagnu): Copy extra source files
	to the host if it is remote.  Let tests specify extra headers
	they use.
	* g++.old-deja/g++.abi/vtable3a.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3b.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3c.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3d.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3e.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3f.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3g.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3h.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3i.C: This uses 'vtable3.h'.
	* g++.old-deja/g++.abi/vtable3j.C: This uses 'vtable3.h'.

From-SVN: r47281

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26e1e779a33d6ba8afb3ae6cb3f53707c2da8abe..ac3dfc0758c800274018ec604c62e44a7ef616c1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2001-11-22  Geoffrey Keating  <geoffk@redhat.com>
+
+       * lib/old-dejagnu.exp (old-dejagnu): Copy extra source files
+       to the host if it is remote.  Let tests specify extra headers
+       they use.
+       * g++.old-deja/g++.abi/vtable3a.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3b.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3c.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3d.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3e.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3f.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3g.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3h.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3i.C: This uses 'vtable3.h'.
+       * g++.old-deja/g++.abi/vtable3j.C: This uses 'vtable3.h'.
+
 2001-11-22  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * gcc.c-torture/execute/ieee/20000320-1.c: Fix patterns to work

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3a.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3a.C
index c2c7bbf8fbb6ba5d3399af3aed3bede9287f98ec..8dc912b3d99b2240855cce9de0df41fdc58ac92a 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3a.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3a.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B1_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3b.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3b.C
index 4d4bd99851225787dbbe26a3de0f79b5caf01053..903eab846f89c6feb823d65c1c4f1e72f12bb149 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3b.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3b.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define B1_EMPTY
 #define B2_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3c.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3c.C
index 2863ca5ec5f7039657f21e6066d4702e9571743a..45b891a463b8b0dd5591040017e336556d028fb8 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3c.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3c.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B2_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3d.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3d.C
index a3a2cbcb5a9ba302ee281af23ee1b10e76f753e3..5511c2391c1281cdbba47ce5195f601a7bf57a3f 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3d.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3d.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B1_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3e.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3e.C
index a1c8a9d59e400d8bcb304309e4941ad61f3fddb8..0e71fac1b7ce169f4bb38a2819ba3df6239869e3 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3e.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3e.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B1_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3f.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3f.C
index 7bcf40ccf4b7ba73e1de55d0a16a0047e41a0355..8af79db8662e23aa5b6fbfd83ea2cd27c615f1ca 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3f.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3f.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B1_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3g.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3g.C
index 1ad70bc31604003dd6bf8dac1a080d6d3b719f1f..c97804fa9a6c222612548bbc740a706ef24fbac0 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3g.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3g.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B1_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3h.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3h.C
index 074bda44c7a277f5b19f47c1ba345597f96051ce..0b0a8433a5677c43b47c30719a6e4f80fe9b7123 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3h.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3h.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define A_EMPTY
 #define B1_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3i.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3i.C
index d6fc3a3506b7c67d945505be26f0bd04b65e0151..6c48244ac68c9d38319bcdd74dcf43947b8da54d 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3i.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3i.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define B1_EMPTY
 #define B2_EMPTY

diff --git a/gcc/testsuite/g++.old-deja/g++.abi/vtable3j.C b/gcc/testsuite/g++.old-deja/g++.abi/vtable3j.C
index 1af5225c536b8aa8bfeb1ce60a24be6990068d5b..0b8925cb72628b86cb0b3eb59a3d559789e8a43a 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.abi/vtable3j.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/vtable3j.C
@@ -2,6 +2,7 @@
 // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
 
 // Check constructor vtables work.
+// Additional files: vtable3.h
 
 #define B1_EMPTY
 #define B2_EMPTY

diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp
index 8384e8392c6b03543f8ea74b576962b14ad6c1e3..105c37d56058612e43dd3df86a12ba41d99c461b 100644 (file)
--- a/gcc/testsuite/lib/old-dejagnu.exp
+++ b/gcc/testsuite/lib/old-dejagnu.exp
@@ -205,6 +205,7 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
 
     set tmp [lindex [grep $prog "Special.*Options:.*"] 0]
     set cflags ""
+    set to_download ""
 
     regsub -all "\n\[^\n\]+(\n|$)" $tmp "\n" tmp
     set tmp [string trim $tmp]
@@ -225,11 +226,27 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
     set tmp [string trim $tmp]
     if ![string match "" $tmp] then {
        regsub "^.*Additional.*sources:" $tmp "" tmp
+       if [is_remote host] {
+           lappend cflags "additional_flags=$tmp"
+       }
        regsub -all " " $tmp " [file dirname $prog]/" tmp
-       lappend cflags "additional_flags=$tmp"
+       if ![is_remote host] {
+           lappend cflags "additional_flags=$tmp"
+       }
+       set to_download [concat $to_download $tmp]
        verbose "Adding sources $tmp"
     }
 
+    set tmp [lindex [grep $prog "Additional files: .*"] 0]
+    regsub -all "\n\[^\n\]+(\n|$)" $tmp "\n" tmp
+    set tmp [string trim $tmp]
+    if ![string match "" $tmp] then {
+       regsub "^.*Additional.*files:" $tmp "" tmp
+       regsub -all " " $tmp " [file dirname $prog]/" tmp
+       set to_download [concat $to_download $tmp]
+       verbose "Downloading files $tmp"
+    }
+
     lappend cflags "compiler=$compiler"
 
     regsub -all "\[./\]" "$name" "-" output;
@@ -408,6 +425,12 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
 #
 #  run the compiler and analyze the results
 #
+    # Download any source or header files we might need.
+    if [is_remote host] {
+       foreach file $to_download {
+           remote_download host $file
+       }
+    }
 
     # Since we don't check return status of the compiler, make sure
     # we can't run a.out when the compilation fails.