From 149b30ffe4d328b38353c9236f4eb790f013558e Mon Sep 17 00:00:00 2001
From: Doug Evans <dje@google.com>
Date: Tue, 11 Feb 2014 15:47:50 -0800
Subject: [PATCH] * gdb.dwarf2/dwp-symlink.exp: Rewrite to use remote_*
 commands instead of Tcl file commands.

---
 gdb/testsuite/ChangeLog                  |  5 +++++
 gdb/testsuite/gdb.dwarf2/dwp-symlink.exp | 32 +++++++++++++-------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6216b25..6da4e1c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-11  Doug Evans  <dje@google.com>
+
+	* gdb.dwarf2/dwp-symlink.exp: Rewrite to use remote_* commands instead
+	of Tcl file commands.
+
 2014-02-10  Mark Kettenis  <kettenis@gnu.org>
 
 	* gdb.threads/step-after-sr-lock.exp: Avoid executing
diff --git a/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp b/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp
index 46032a8..a0e1897 100644
--- a/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp
@@ -15,35 +15,30 @@
 
 standard_testfile
 
-if [is_remote host] {
-    untested "remote host"
-    return 0
-}
-
-file delete [standard_output_file ${testfile}.dwp]
-if [file exists [standard_output_file ${testfile}.dwp]] {
+remote_file host delete [standard_output_file ${testfile}.dwp]
+if [remote_file host exists [standard_output_file ${testfile}.dwp]] {
     unsupported "dwp file cannot be deleted"
     return 0
 }
 if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
     return -1
 }
-if ![file exists [standard_output_file ${testfile}.dwp]] {
+if ![remote_file host exists [standard_output_file ${testfile}.dwp]] {
     unsupported "testsuite run does not produce dwp files"
     return 0
 }
 
 set thelink "${testfile}-thelink"
 
-file delete [standard_output_file ${thelink}]
-file delete [standard_output_file ${thelink}.dwp]
+remote_file host delete [standard_output_file ${thelink}]
+remote_file host delete [standard_output_file ${thelink}.dwp]
 # file link is only Tcl 8.4+.
-exec "ln" "-sf" "${testfile}" "[standard_output_file $thelink]"
-if ![file exists [standard_output_file $thelink]] {
+remote_exec host "ln -sf ${testfile} [standard_output_file $thelink]"
+if ![remote_file host exists [standard_output_file $thelink]] {
     unsupported "host does not support symbolic links (binary symlink is missing)"
     return 0
 }
-if [file exists [standard_output_file $thelink.dwp]] {
+if [remote_file host exists [standard_output_file $thelink.dwp]] {
     unsupported "host does not support symbolic links (we tried to delete a file and it is still there)"
     return 0
 }
@@ -57,12 +52,12 @@ clean_restart "$thelink"
 gdb_test "ptype main" {type = int \(int, char \*\*\)} "binary symlink, dwp default"
 
 gdb_exit
-file rename [standard_output_file ${testfile}.dwp] [standard_output_file ${thelink}.dwp]
-if [file exists [standard_output_file ${testfile}.dwp]] {
+remote_exec host "mv -f [standard_output_file ${testfile}.dwp] [standard_output_file ${thelink}.dwp]"
+if [remote_file host exists [standard_output_file ${testfile}.dwp]] {
     unsupported "host does not support symbolic links (binary symlink exists)"
     return 0
 }
-if ![file exists [standard_output_file ${thelink}.dwp]] {
+if ![remote_file host exists [standard_output_file ${thelink}.dwp]] {
     unsupported "host does not support symbolic links (dwp symlink is missing)"
     return 0
 }
@@ -79,8 +74,6 @@ gdb_test "ptype main" {type = int \(int, char \*\*\)} "binary symlink, dwp at sy
 # Verify we can still find the dwp if we change directories and we specified
 # a relative path for the program.
 
-set saved_pwd [pwd]
-
 # This is clean_restart, but specifying a relative path to the binary.
 gdb_exit
 gdb_start
@@ -94,4 +87,5 @@ gdb_test "cd .." "Working directory .*"
 gdb_test "ptype main" {type = int \(int, char \*\*\)} \
     "relative path, binary symlink, dwp at symlink"
 
-cd $saved_pwd
+# N.B. At this point the active gdb is in, essentially, some random directory.
+# Restart a new copy if you add more tests here.
-- 
2.7.4