gdb/testsuite/

	* gdb.xml/tdesc-arch.exp, gdb.xml/tdesc-regs.exp: Rewrite file
	creation to support remote host testing.

2 files changed, 17 insertions, 11 deletions

diff --git a/gdb/testsuite/gdb.xml/tdesc-arch.exp b/gdb/testsuite/gdb.xml/tdesc-arch.exp
index 73af810..dff8a85 100644
--- a/gdb/testsuite/gdb.xml/tdesc-arch.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-arch.exp
@@ -58,13 +58,15 @@ if { "$arch1" == "" || "$arch2" == "" || "$default_arch" == "" } {
 
 proc set_arch { arch which } {
     global gdb_prompt
+    global subdir
 
-    set fd [open "tdesc-arch.xml" w]
+    set fd [open "$subdir/tdesc-arch.xml" w]
     puts $fd \
 	"<target>
 	    <architecture>$arch</architecture>
 	 </target>"
     close $fd
+    remote_download host "${subdir}/tdesc-arch.xml" "tdesc-arch.xml"
 
     # Anchor the test output, so that error messages are detected.
     set cmd "set tdesc filename tdesc-arch.xml"
@@ -84,19 +86,21 @@ proc set_arch { arch which } {
 	"The target architecture is set automatically \\(currently $arch\\)" \
 	"$cmd ($which architecture)"
 
-    file delete "tdesc-arch.xml"
+    file delete "${subdir}/tdesc-arch.xml"
+    remote_file host delete "tdesc-arch.xml"
 }
 
 set_arch $arch1 first
 set_arch $arch2 second
 
 # Check an invalid architecture setting.
-set fd [open "tdesc-arch.xml" w]
+set fd [open "${subdir}/tdesc-arch.xml" w]
 puts $fd \
     "<target>
        <architecture>invalid</architecture>
      </target>"
 close $fd
+remote_download host "$subdir/tdesc-arch.xml" "tdesc-arch.xml"
 
 set cmd "set tdesc filename tdesc-arch.xml"
 gdb_test $cmd \
@@ -108,4 +112,5 @@ gdb_test $cmd \
     "The target architecture is set automatically \\(currently $default_arch\\)" \
     "$cmd (invalid architecture)"
 
-file delete "tdesc-arch.xml"
+file delete "${subdir}/tdesc-arch.xml"
+remote_file host delete "tdesc-arch.xml"
diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp
index f11d013..0922ca3 100644
--- a/gdb/testsuite/gdb.xml/tdesc-regs.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp
@@ -80,8 +80,7 @@ gdb_test "set tdesc file $srcdir/$subdir/single-reg.xml" \
 # Copy the core registers into the objdir if necessary, so that they
 # will be found by <xi:include>.
 foreach src ${core-regs} {
-    file delete "$src"
-    file copy "$srcdir/../features/$regdir$src" "$src"
+    set file [remote_download host "$srcdir/../features/$regdir$src" "$src"]
 }
 
 # Similarly, we need to copy files under test into the objdir.
@@ -91,9 +90,9 @@ proc load_description { file errmsg } {
     global gdb_prompt
     global core-regs
 
-    file delete "regs.xml"
+    file delete "$subdir/regs.xml"
     set ifd [open "$srcdir/$subdir/$file" r]
-    set ofd [open "regs.xml" w]
+    set ofd [open "$subdir/regs.xml" w]
     while {[gets $ifd line] >= 0} {
 	if {[regexp {<xi:include href="core-regs.xml"/>} $line]} {
 	    foreach src ${core-regs} {
@@ -105,16 +104,19 @@ proc load_description { file errmsg } {
     }
     close $ifd
     close $ofd
+    remote_download host "$subdir/regs.xml" "regs.xml"
+    file delete "$subdir/regs.xml"
 
     # Anchor the test output, so that error messages are detected.
     set cmd "set tdesc filename regs.xml"
-    set msg "set tdesc filename $file"
+    set msg "set tdesc filename regs.xml - from $file"
     set cmd_regex [string_to_regexp $cmd]
     gdb_test_multiple $cmd $msg {
 	-re "^$cmd_regex\r\n$errmsg$gdb_prompt $" {
 	    pass $msg
 	}
     }
+    remote_file host delete "regs.xml"
 }
 
 load_description "extra-regs.xml" ""
@@ -130,6 +132,5 @@ load_description "core-only.xml" ""
 gdb_test "ptype \$extrareg" "type = void"
 
 foreach src ${core-regs} {
-    file delete "$src"
+    remote_file host delete "$src"
 }
-file delete "regs.xml"