* gcc.misc-tests/linkage.exp: Do not run on remote hosts.

	* lib/compat.exp (compat-run): Use file_on_host, not remote_file
	build.
	(compat-execute): Likewise.
	* lib/copy-file.exp (gcc_copy_files): Use remote_download to copy
	files to remote hosts.
	* lib/c-ctorture.exp (c-torture-compile): Likewise.
	(c-torture-execute): Likewise.
	* lib/dg-pch.exp (dg-pch): Use file_on_host, not remote_file build
	or plain file.  Use remote_upload and remote_download to copy
	files about.
	* lib/scanasm.exp (dg-scan): Upload the file from the remote host
	before scanning it.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@123914 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 52 insertions, 27 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c3d96c31fdf..f04e4984161 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2007-04-17  Mark Mitchell  <mark@codesourcery.com>
+
+	* gcc.misc-tests/linkage.exp: Do not run on remote hosts.
+	* lib/compat.exp (compat-run): Use file_on_host, not remote_file
+	build.
+	(compat-execute): Likewise.
+	* lib/copy-file.exp (gcc_copy_files): Use remote_download to copy
+	files to remote hosts.
+	* lib/c-ctorture.exp (c-torture-compile): Likewise.
+	(c-torture-execute): Likewise.
+	* lib/dg-pch.exp (dg-pch): Use file_on_host, not remote_file build
+	or plain file.  Use remote_upload and remote_download to copy
+	files about.
+	* lib/scanasm.exp (dg-scan): Upload the file from the remote host
+	before scanning it.
+
 2007-04-17  Dorit Nuzman  <dorit@il.ibm.com>
 
 	* gcc.dg/vect/no-tree-scev-cprop-vect-iv-3.c: New test.
@@ -55,6 +71,7 @@
 	* g++.dg/warn/anonymous-namespace-1.C: New test
 	* g++.dg/warn/anonymous-namespace-1.h: New test
 
+>>>>>>> .r123913
 2007-04-14  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
 	PR testsuite/31578
@@ -224,6 +241,7 @@
 	* lib/target-supports.exp
 	(check_effective_target_fstack_protector): Rewrite.
 
+>>>>>>> .r123860
 2007-04-09  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/31449
diff --git a/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/testsuite/gcc.misc-tests/linkage.exp
index a0805212d6b..10eeba6c15e 100644
--- a/gcc/testsuite/gcc.misc-tests/linkage.exp
+++ b/gcc/testsuite/gcc.misc-tests/linkage.exp
@@ -18,7 +18,7 @@
 # was written by Rob Savoye. (rob@cygnus.com)
 # All the other tests driven by that file have since been moved elsewhere.
 
-if [isnative] then {
+if { [isnative] && ![is_remote host] } then {
     set lines [gcc_target_compile "$srcdir/$subdir/linkage-x.c" "linkage-x.o" object {additional_flags="-w"}]
     if ![string match "" $lines] then {
 	fail "$subdir/linkage.c compile"
diff --git a/gcc/testsuite/lib/c-torture.exp b/gcc/testsuite/lib/c-torture.exp
index 185775d2249..a65bda51361 100644
--- a/gcc/testsuite/lib/c-torture.exp
+++ b/gcc/testsuite/lib/c-torture.exp
@@ -96,7 +96,7 @@ proc c-torture-compile { src option } {
 
     set comp_output [gcc_target_compile "$src" "$output" object $options]
     gcc_check_compile $testcase $option $output $comp_output
-    remote_file build delete $output
+    file_on_host delete $output
 }
 
 #
@@ -171,7 +171,7 @@ proc c-torture-execute { sources args } {
             set ignore_me [eval $torture_eval_before_compile]
 	}
 
-	remote_file build delete $execname
+	file_on_host delete $execname
 	verbose "Testing $testcase, $option" 1
 
 	set options ""
@@ -183,7 +183,7 @@ proc c-torture-execute { sources args } {
 
 	if ![gcc_check_compile "$testcase compilation" $option $execname $comp_output] {
 	    unresolved "$testcase execution, $option"
-	    remote_file build delete $execname
+	    file_on_host delete $execname
 	    continue
 	}
 
@@ -220,7 +220,7 @@ proc c-torture-execute { sources args } {
 	# the entire process down because it usually does not "hit".
 	set skip 0
 	if { ![isnative] && [info exists oldexec] } {
-	    if { [remote_file build cmp $oldexec $execname] == 0 } {
+	    if { [file_on_host cmp $oldexec $execname] == 0 } {
 		set skip 1
 	    }
 	}
@@ -230,14 +230,14 @@ proc c-torture-execute { sources args } {
 	    set output [lindex $result 1]
 	}
         if { $oldstatus == "pass" } {
-	    remote_file build delete $oldexec
+	    file_on_host delete $oldexec
         }
 	$status "$testcase execution, $option"
 	set oldstatus $status
     }
     if [info exists status] {
 	if { $status == "pass" } {
-	    remote_file build delete $execname
+	    file_on_host delete $execname
 	}
     }
 }
diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp
index 6e15f91e3de..363c44d5319 100644
--- a/gcc/testsuite/lib/compat.exp
+++ b/gcc/testsuite/lib/compat.exp
@@ -115,7 +115,7 @@ proc compat-run { testname objlist dest optall optfile optstr } {
 
     # Check that all of the objects were built successfully.
     foreach obj [split $objlist] {
-	if ![file exists $obj] then {
+	if ![file_on_host exists $obj] then {
 	    unresolved "$testcase $testname link $optstr"
 	    unresolved "$testcase $testname execute $optstr"
 	    return
@@ -142,7 +142,7 @@ proc compat-run { testname objlist dest optall optfile optstr } {
     set result [${tool}_load $dest "" ""]
     set status [lindex $result 0]
     if { $status == "pass" } then {
-	remote_file build delete $dest
+	file_on_host delete $dest
     }
     $status "$testcase $testname execute $optstr"
 }
@@ -330,10 +330,10 @@ proc compat-execute { src1 sid use_alt } {
 	set execname4 "${execbase}-${count}4"
 	incr count
 
-	remote_file build delete $execname1
-	remote_file build delete $execname2
-	remote_file build delete $execname3
-	remote_file build delete $execname4
+	file_on_host delete $execname1
+	file_on_host delete $execname2
+	file_on_host delete $execname3
+	file_on_host delete $execname4
 
 	# Compile pieces with the alternate compiler; we'll catch problems
 	# later.  Skip this if we don't have an alternate compiler.
@@ -373,7 +373,7 @@ proc compat-execute { src1 sid use_alt } {
 	if { $files != "" } {
 	    foreach objfile $files {
 		if { ![info exists gluefile] || $objfile != $gluefile } {
-		    eval "remote_file build delete $objfile"
+		    eval "file_on_host delete $objfile"
 		}
 	    }
 	}
diff --git a/gcc/testsuite/lib/copy-file.exp b/gcc/testsuite/lib/copy-file.exp
index 8d24b898d60..8041ccf377a 100644
--- a/gcc/testsuite/lib/copy-file.exp
+++ b/gcc/testsuite/lib/copy-file.exp
@@ -19,7 +19,9 @@
 
 proc gcc_copy_files {srcfiles dstdir} {
     foreach f $srcfiles {
-	if { [catch { set symlink [file readlink $f] } x] } then {
+	if { [is_remote host] } {
+	    remote_download host $f $dstdir
+	} elseif { [catch { set symlink [file readlink $f] } x] } then {
 	    file copy -force $f $dstdir
 	} else {
 	    if { [regexp "^/" "$symlink"] } then {
diff --git a/gcc/testsuite/lib/dg-pch.exp b/gcc/testsuite/lib/dg-pch.exp
index ac8bafcfd0f..6a5f6574b1f 100644
--- a/gcc/testsuite/lib/dg-pch.exp
+++ b/gcc/testsuite/lib/dg-pch.exp
@@ -26,9 +26,9 @@ proc dg-pch { subdir test options suffix } {
     set nshort "$subdir/[file tail $test]"
     set bname "[file rootname [file tail $nshort]]"
 
-    catch { file delete "$bname$suffix.gch" }
-    catch { file delete "$bname.s" }
-    catch { file delete "$bname.s-gch" }
+    catch { file_on_host delete "$bname$suffix.gch" }
+    catch { file_on_host delete "$bname.s" }
+    catch { file_on_host delete "$bname.s-gch" }
 
     # We don't try to use the loop-optimizing options, since they are highly
     # unlikely to make any difference to PCH.
@@ -37,23 +37,25 @@ proc dg-pch { subdir test options suffix } {
 
 	# For the header files, the default is to precompile.
 	set dg-do-what-default precompile
-	catch { file delete "$bname$suffix" }
+	catch { file_on_host delete "$bname$suffix" }
 	gcc_copy_files "[file rootname $test]${suffix}s" "$bname$suffix"
 	dg-test -keep-output "./$bname$suffix" $flags ""
 
 	# For the rest, the default is to compile to .s.
 	set dg-do-what-default compile
 
-	if { [ file exists "$bname$suffix.gch" ] } {
+	if { [ file_on_host exists "$bname$suffix.gch" ] } {
 	    # Ensure that the PCH file is used, not the original header.
-	    file delete "$bname$suffix"
+	    file_on_host delete "$bname$suffix"
 
 	    dg-test -keep-output $test $flags "-I."
-	    file delete "$bname$suffix.gch"
-	    if { [ file exists "$bname.s" ] } {
-		file rename "$bname.s" "$bname.s-gch"
+	    file_on_host delete "$bname$suffix.gch"
+	    if { [ file_on_host exists "$bname.s" ] } {
+		remote_upload host "$bname.s" "$bname.s-gch"
+		remote_download host "$bname.s-gch"
 		gcc_copy_files "[file rootname $test]${suffix}s" "$bname$suffix"
 		dg-test -keep-output $test $flags "-I."
+		remote_upload host "$bname.s"
 		set tmp [ diff "$bname.s" "$bname.s-gch" ]
 		if { $tmp == 0 } {
 		    untested "$nshort $flags assembly comparison"
@@ -62,9 +64,9 @@ proc dg-pch { subdir test options suffix } {
 		} else {
 		    fail "$nshort $flags assembly comparison"
 		}
-		file delete "$bname$suffix"
-		file delete "$bname.s"
-		file delete "$bname.s-gch"
+		file_on_host delete "$bname$suffix"
+		file_on_host delete "$bname.s"
+		file_on_host delete "$bname.s-gch"
 	    } else {
 		untested "$nshort $flags assembly comparison"
 	    }
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index a8d4bc9f98d..0b7fcb1001c 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -44,6 +44,9 @@ proc dg-scan { name positive testcase output_file orig_args } {
 	}
     }
 
+    if { [is_remote host] } {
+	remote_upload host "$output_file"
+    } 
     set fd [open $output_file r]
     set text [read $fd]
     close $fd