diff options
-rw-r--r-- | gcc/testsuite/ChangeLog | 16 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3a.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3b.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3c.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3d.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3e.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3f.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3g.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3h.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3i.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.old-deja/g++.abi/vtable3j.C | 1 | ||||
-rw-r--r-- | gcc/testsuite/lib/old-dejagnu.exp | 25 |
12 files changed, 50 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 26e1e77..ac3dfc0 100644 --- 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 c2c7bbf..8dc912b 100644 --- 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 4d4bd99..903eab8 100644 --- 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 2863ca5..45b891a 100644 --- 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 a3a2cbc..5511c23 100644 --- 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 a1c8a9d..0e71fac 100644 --- 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 7bcf40c..8af79db 100644 --- 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 1ad70bc..c97804f 100644 --- 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 074bda4..0b0a843 100644 --- 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 d6fc3a3..6c48244 100644 --- 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 1af5225..0b8925c 100644 --- 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 8384e83..105c37d 100644 --- 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. |