memcheck.exp: Make sure a remote host is equipped with driver.h and driver.o so it can...

	* execute/memcheck/memcheck.exp: Make sure a remote
	host is equipped with driver.h and driver.o so it can actually
	compile and run the tests.

From-SVN: r29982

2 files changed, 34 insertions, 0 deletions

diff --git a/gcc/testsuite/gcc.c-torture/ChangeLog b/gcc/testsuite/gcc.c-torture/ChangeLog
index 28cadeb..fec03d0 100644
--- a/gcc/testsuite/gcc.c-torture/ChangeLog
+++ b/gcc/testsuite/gcc.c-torture/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-13  Brendan Kehoe  <brendan@cygnus.com>
+
+	* execute/memcheck/memcheck.exp: Make sure a remote
+	host is equipped with driver.h and driver.o so it can actually
+	compile and run the tests.
+
 Fri Oct  8 18:46:11 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
 
 	* compile/991008-1.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/execute/memcheck/memcheck.exp b/gcc/testsuite/gcc.c-torture/execute/memcheck/memcheck.exp
index 7fb756b..29fb897 100644
--- a/gcc/testsuite/gcc.c-torture/execute/memcheck/memcheck.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/memcheck/memcheck.exp
@@ -43,7 +43,29 @@ if $idx>=0 {
 } else {
     error "list can't find driver.c in $srcdir/$subdir"
 }
+
+# Compiling driver.c on a remote host requires our ability to also
+# find its driver.h header.
+if [is_remote host] {
+    remote_download host $srcdir/$subdir/driver.h
+}
+
+#
+#  Do the compile.
+#
 gcc_target_compile $srcdir/$subdir/driver.c driver.o object {additional_flags=-w additional_flags=-g}
+
+# In target.exp:default_target_compile, we download the resulting a.out
+# to our local driver.o file, and delete a.out on the host.  This doesn't
+# work for this set of tests, since each test needs to link against driver.o.
+# So, to get around this we put it back.  This was chosen instead of actually
+# modifying target.exp to somehow provide the option to keep the file on
+# the remote host, since there aren't yet (in late 1999) enough tests
+# doing this to warrant the change. 
+if [is_remote host] {
+    remote_download host driver.o
+}
+
 foreach src $tests {
     # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] then {
@@ -52,3 +74,9 @@ foreach src $tests {
 
     c-torture-execute $src "-fcheck-memory-usage driver.o"
 }
+
+# Clean up after ourselves.
+if [is_remote host] {
+    remote_file host delete driver.o
+}
+