file-format.exp (gcc_target_object_format): Use remote_exec to call objdump.

gcc/testsuite:
	* lib/file-format.exp (gcc_target_object_format): Use remote_exec
	to call objdump.
	* lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
	Use remote_exec to call c++filt.
	* lib/target-supports-dg.exp (dg-require-host-local): New.
	* gcc.misc-tests/options.exp: Allow .exe in command paths.
	* g++.dg/parse/repo1.C: Use dg-require-host-local.
	* g++.dg/rtti/repo1.C: Likewise.
	* g++.dg/template/repo1.C: Likewise.
	* g++.dg/template/repo2.C: Likewise.
	* g++.dg/template/repo3.C: Likewise.
	* g++.dg/template/repo4.C: Likewise.
	* g++.dg/template/repo5.C: Likewise.
	* g++.old-deja/g++.pt/instantiate4.C: Likewise.
	* g++.old-deja/g++.pt/instantiate6.C: Likewise.
	* g++.old-deja/g++.pt/repo1.C: Likewise.
	* g++.old-deja/g++.pt/repo2.C: Likewise.
	* g++.old-deja/g++.pt/repo3.C: Likewise.
	* g++.old-deja/g++.pt/repo4.C: Likewise.
	* gcc.dg/cpp/trad/builtins.c: Likewise.

libstdc++-v3:
	* testsuite/lib/libstdc++.exp (v3-build-support): Specify output
	file for preprocessing.  Use remote_exec to call ar and ranlib.

From-SVN: r128283

19 files changed, 59 insertions, 12 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b29fc79..06d1e72 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,26 @@
+2007-09-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* lib/file-format.exp (gcc_target_object_format): Use remote_exec
+	to call objdump.
+	* lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
+	Use remote_exec to call c++filt.
+	* lib/target-supports-dg.exp (dg-require-host-local): New.
+	* gcc.misc-tests/options.exp: Allow .exe in command paths.
+	* g++.dg/parse/repo1.C: Use dg-require-host-local.
+	* g++.dg/rtti/repo1.C: Likewise.
+	* g++.dg/template/repo1.C: Likewise.
+	* g++.dg/template/repo2.C: Likewise.
+	* g++.dg/template/repo3.C: Likewise.
+	* g++.dg/template/repo4.C: Likewise.
+	* g++.dg/template/repo5.C: Likewise.
+	* g++.old-deja/g++.pt/instantiate4.C: Likewise.
+	* g++.old-deja/g++.pt/instantiate6.C: Likewise.
+	* g++.old-deja/g++.pt/repo1.C: Likewise.
+	* g++.old-deja/g++.pt/repo2.C: Likewise.
+	* g++.old-deja/g++.pt/repo3.C: Likewise.
+	* g++.old-deja/g++.pt/repo4.C: Likewise.
+	* gcc.dg/cpp/trad/builtins.c: Likewise.
+
 2007-09-08  Zdenek Dvorak  <ook@ucw.cz>
 
 	PR tree-optimization/32283
diff --git a/gcc/testsuite/g++.dg/parse/repo1.C b/gcc/testsuite/g++.dg/parse/repo1.C
index 44f004b..efadd58 100644
--- a/gcc/testsuite/g++.dg/parse/repo1.C
+++ b/gcc/testsuite/g++.dg/parse/repo1.C
@@ -1,4 +1,5 @@
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 
 extern "C" inline void f() {}
 
diff --git a/gcc/testsuite/g++.dg/rtti/repo1.C b/gcc/testsuite/g++.dg/rtti/repo1.C
index 54b52b3..7ff813b 100644
--- a/gcc/testsuite/g++.dg/rtti/repo1.C
+++ b/gcc/testsuite/g++.dg/rtti/repo1.C
@@ -1,5 +1,6 @@
 // PR c++/22204
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 
 #include <typeinfo>
 template<int>
diff --git a/gcc/testsuite/g++.dg/template/repo1.C b/gcc/testsuite/g++.dg/template/repo1.C
index 08eea88..cb4c5a1 100644
--- a/gcc/testsuite/g++.dg/template/repo1.C
+++ b/gcc/testsuite/g++.dg/template/repo1.C
@@ -1,4 +1,5 @@
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 
 struct A {
   A();
diff --git a/gcc/testsuite/g++.dg/template/repo2.C b/gcc/testsuite/g++.dg/template/repo2.C
index d2e0801..3618997 100644
--- a/gcc/testsuite/g++.dg/template/repo2.C
+++ b/gcc/testsuite/g++.dg/template/repo2.C
@@ -1,5 +1,6 @@
 // PR c++/17163
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 
 template <int __inst>
 struct __Atomicity_lock
diff --git a/gcc/testsuite/g++.dg/template/repo3.C b/gcc/testsuite/g++.dg/template/repo3.C
index dfc085a2..49a8fa5 100644
--- a/gcc/testsuite/g++.dg/template/repo3.C
+++ b/gcc/testsuite/g++.dg/template/repo3.C
@@ -1,4 +1,5 @@
 // { dg-options "-frepo -DF='a'" }
+// { dg-require-host-local "" }
 
 template <typename A, typename B> void f () {}
 template <typename A, typename B> void g () { f<int,int>(); }
diff --git a/gcc/testsuite/g++.dg/template/repo4.C b/gcc/testsuite/g++.dg/template/repo4.C
index bd07f9580..27714b5 100644
--- a/gcc/testsuite/g++.dg/template/repo4.C
+++ b/gcc/testsuite/g++.dg/template/repo4.C
@@ -1,6 +1,7 @@
 // PR c++/17775
 // { dg-options "-frepo" }
 // { dg-final { cleanup-repo-files } }
+// { dg-require-host-local "" }
 
 namespace { 
   struct Foo {}; 
diff --git a/gcc/testsuite/g++.dg/template/repo5.C b/gcc/testsuite/g++.dg/template/repo5.C
index 334b0a5..0d2893e 100644
--- a/gcc/testsuite/g++.dg/template/repo5.C
+++ b/gcc/testsuite/g++.dg/template/repo5.C
@@ -1,6 +1,7 @@
 // PR c++/25625
 // { dg-options "-frepo" } 
 // { dg-final { cleanup-repo-files } }
+// { dg-require-host-local "" }
 
 template< typename T, T N > struct integral_c {
   static const T value = N;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/instantiate4.C b/gcc/testsuite/g++.old-deja/g++.pt/instantiate4.C
index 031b6ba..9c1aaf5 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/instantiate4.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/instantiate4.C
@@ -1,5 +1,6 @@
 // { dg-do link }
 // { dg-options "-frepo -Werror" }
+// { dg-require-host-local "" }
 // Build then link:
 
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/instantiate6.C b/gcc/testsuite/g++.old-deja/g++.pt/instantiate6.C
index beccdc2..a1223fc 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/instantiate6.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/instantiate6.C
@@ -1,5 +1,6 @@
 // { dg-do link }
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 // Build then link:
 
 // Simplified from testcase by Erez Louidor Lior <s3824888@techst02.technion.ac.il>
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/repo1.C b/gcc/testsuite/g++.old-deja/g++.pt/repo1.C
index c04b69e..f3fdddc 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/repo1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/repo1.C
@@ -1,5 +1,6 @@
 // { dg-do link }
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 
 // Bug: g++ complains about duplicate explicit instantiations with -frepo.
 // From Jason Merrill <jason@cygnus.com>
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/repo2.C b/gcc/testsuite/g++.old-deja/g++.pt/repo2.C
index c05fa10..b40961c 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/repo2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/repo2.C
@@ -1,5 +1,6 @@
 // { dg-do link  }
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 // Test that collect2 isn't confused by GNU ld's "In function `foo':" message.
 // Contributed by Jason Merrill <jason@cygnus.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/repo3.C b/gcc/testsuite/g++.old-deja/g++.pt/repo3.C
index 9b218fc..7995030 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/repo3.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/repo3.C
@@ -1,5 +1,6 @@
 // { dg-do link }
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 // Test that we properly generate the vtable and such for C.
 // Contributed by scott snyder <snyder@fnal.gov>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/repo4.C b/gcc/testsuite/g++.old-deja/g++.pt/repo4.C
index d1a2d70..6a0a55a 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/repo4.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/repo4.C
@@ -1,5 +1,6 @@
 // { dg-do link }
 // { dg-options "-frepo" }
+// { dg-require-host-local "" }
 // Build then link:
 
 template <class T>
diff --git a/gcc/testsuite/gcc.dg/cpp/trad/builtins.c b/gcc/testsuite/gcc.dg/cpp/trad/builtins.c
index df27189..74798bb 100644
--- a/gcc/testsuite/gcc.dg/cpp/trad/builtins.c
+++ b/gcc/testsuite/gcc.dg/cpp/trad/builtins.c
@@ -50,3 +50,5 @@ int main ()
 
   return 0;
 }
+
+/* { dg-require-host-local "" } */
diff --git a/gcc/testsuite/gcc.misc-tests/options.exp b/gcc/testsuite/gcc.misc-tests/options.exp
index b7a9cb5..1d4b779 100644
--- a/gcc/testsuite/gcc.misc-tests/options.exp
+++ b/gcc/testsuite/gcc.misc-tests/options.exp
@@ -36,15 +36,15 @@ proc check_for_options {language gcc_options compiler_pattern as_pattern ld_patt
     set gcc_output [gcc_target_compile $filename.c $filename.x executable $gcc_options]
     remote_file build delete $filename.c $filename.x $filename.gcno
 
-    if {![regexp -- "/$compiler -quiet.*$compiler_pattern" $gcc_output]} {
+    if {![regexp -- "/${compiler}(\\.exe)? -quiet.*$compiler_pattern" $gcc_output]} {
 	fail "$test (compiler options)"
 	return
     }
-    if {![regexp -- " *as .*$as_pattern" $gcc_output]} {
+    if {![regexp -- " *as(\\.exe)? .*$as_pattern" $gcc_output]} {
 	fail "$test (assembler options)"
 	return
     }
-    if {![regexp -- "/collect2 .*$ld_pattern" $gcc_output]} {
+    if {![regexp -- "/collect2(\\.exe)? .*$ld_pattern" $gcc_output]} {
 	fail "$test (linker options)"
 	return
     }
diff --git a/gcc/testsuite/lib/file-format.exp b/gcc/testsuite/lib/file-format.exp
index 87bddd7..491cf12 100644
--- a/gcc/testsuite/lib/file-format.exp
+++ b/gcc/testsuite/lib/file-format.exp
@@ -48,9 +48,8 @@ proc gcc_target_object_format { } {
         ${tool}_target_compile objfmtst.c objfmtst.o object ""
 	file delete objfmtst.c       
         
-	catch {
-          set output [exec $objdump_name --file-headers objfmtst.o ]
-        } output
+	set output [remote_exec host "$objdump_name" "--file-headers objfmtst.o"]
+	set output [lindex $output 1]
 
         file delete objfmtst.o
         
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index 83d1d44..0621e7d 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -217,9 +217,8 @@ proc scan-assembler-dem { args } {
     upvar 2 name testcase
     set output_file "[file rootname [file tail $testcase]].s"
 
-    set fd [open "| $cxxfilt < $output_file" r]
-    set text [read $fd]
-    close $fd
+    set output [remote_exec host "$cxxfilt" "" "$output_file"]
+    set text [lindex $output 1]
 
     if [regexp -- [lindex $args 0] $text] {
 	pass "$testcase scan-assembler-dem [lindex $args 0]"
@@ -263,9 +262,8 @@ proc scan-assembler-dem-not { args } {
     upvar 2 name testcase
     set output_file "[file rootname [file tail $testcase]].s"
 
-    set fd [open "| $cxxfilt < $output_file" r]
-    set text [read $fd]
-    close $fd
+    set output [remote_exec host "$cxxfilt" "" "$output_file"]
+    set text [lindex $output 1]
 
     if ![regexp -- [lindex $args 0] $text] {
 	pass "$testcase scan-assembler-dem-not [lindex $args 0]"
diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp
index 40f8217..e7f9175 100644
--- a/gcc/testsuite/lib/target-supports-dg.exp
+++ b/gcc/testsuite/lib/target-supports-dg.exp
@@ -150,6 +150,18 @@ proc dg-require-cxa-atexit { args } {
     }
 }
 
+# If the host is remote rather than the same as the build system, skip
+# this test.  Some tests are incompatible with DejaGnu's handling of
+# remote hosts, which involves copying the source file to the host and
+# compiling it with a relative path and "-o a.out".
+
+proc dg-require-host-local { args } {
+    if [ is_remote host ] {
+        upvar dg-do-what dg-do-what
+        set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+    }
+}
+
 # Check the flags with which the test will be run against options in
 # a test directive that will skip or xfail that test.  The DejaGnu proc
 # check_conditional_xfail will look at the options in compiler_flags, so