Commit 8d49efb0 by Geoffrey Keating Committed by Geoffrey Keating

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
parent a338be44
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> 2001-11-22 Nick Clifton <nickc@cambridge.redhat.com>
* gcc.c-torture/execute/ieee/20000320-1.c: Fix patterns to work * gcc.c-torture/execute/ieee/20000320-1.c: Fix patterns to work
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B1_EMPTY #define B1_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define B1_EMPTY #define B1_EMPTY
#define B2_EMPTY #define B2_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B2_EMPTY #define B2_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B1_EMPTY #define B1_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B1_EMPTY #define B1_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B1_EMPTY #define B1_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B1_EMPTY #define B1_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define A_EMPTY #define A_EMPTY
#define B1_EMPTY #define B1_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define B1_EMPTY #define B1_EMPTY
#define B2_EMPTY #define B2_EMPTY
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com> // Contributed by Nathan Sidwell 4 February 2001 <nathan@codesourcery.com>
// Check constructor vtables work. // Check constructor vtables work.
// Additional files: vtable3.h
#define B1_EMPTY #define B1_EMPTY
#define B2_EMPTY #define B2_EMPTY
......
...@@ -205,6 +205,7 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } { ...@@ -205,6 +205,7 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
set tmp [lindex [grep $prog "Special.*Options:.*"] 0] set tmp [lindex [grep $prog "Special.*Options:.*"] 0]
set cflags "" set cflags ""
set to_download ""
regsub -all "\n\[^\n\]+(\n|$)" $tmp "\n" tmp regsub -all "\n\[^\n\]+(\n|$)" $tmp "\n" tmp
set tmp [string trim $tmp] set tmp [string trim $tmp]
...@@ -225,11 +226,27 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } { ...@@ -225,11 +226,27 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
set tmp [string trim $tmp] set tmp [string trim $tmp]
if ![string match "" $tmp] then { if ![string match "" $tmp] then {
regsub "^.*Additional.*sources:" $tmp "" tmp regsub "^.*Additional.*sources:" $tmp "" tmp
if [is_remote host] {
lappend cflags "additional_flags=$tmp"
}
regsub -all " " $tmp " [file dirname $prog]/" 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" 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" lappend cflags "compiler=$compiler"
regsub -all "\[./\]" "$name" "-" output; regsub -all "\[./\]" "$name" "-" output;
...@@ -408,6 +425,12 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } { ...@@ -408,6 +425,12 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
# #
# run the compiler and analyze the results # 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 # Since we don't check return status of the compiler, make sure
# we can't run a.out when the compilation fails. # we can't run a.out when the compilation fails.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment