From a0607b84d2cbfb5c3a559cf5d3973bb32bebf44c Mon Sep 17 00:00:00 2001
From: Yao Qi <yao@codesourcery.com>
Date: Wed, 24 Jul 2013 09:17:15 +0000
Subject: [PATCH] gdb/testsuite/

	* gdb.mi/mi-var-cmd.exp: If host is remote, use ${testfile} on
	host.
	* gdb.mi/mi-basics.exp (test_exec_and_symbol_mi_operatons):
	Likewise.  If host is remote, copy ${binfile} to host.
---
 gdb/testsuite/ChangeLog             |  7 +++++++
 gdb/testsuite/gdb.mi/mi-basics.exp  | 15 +++++++++++----
 gdb/testsuite/gdb.mi/mi-var-cmd.exp |  8 +++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 238929e4861..e35711b1a7f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-24  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.mi/mi-var-cmd.exp: If host is remote, use ${testfile} on
+	host.
+	* gdb.mi/mi-basics.exp (test_exec_and_symbol_mi_operatons):
+	Likewise.  If host is remote, copy ${binfile} to host.
+
 2013-07-23  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.mi/mi-var-cmd.exp: Adjust pattern to match current error
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
index c8bb3f77014..f4ffa05bb4e 100644
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -71,13 +71,20 @@ proc test_mi_interpreter_selection {} {
 
 proc test_exec_and_symbol_mi_operatons {} {
     global mi_gdb_prompt
-    global binfile
+    global binfile testfile
+
+    if [is_remote host] {
+	set filename ${testfile}
+	remote_download host ${binfile} ${filename}
+    } else {
+	set filename ${binfile}
+    }
 
     # Load symbols and specify executable on a single operation
     # Tests:
     # -file-exec-and-symbols
 
-    if [mi_gdb_test "-file-exec-and-symbols ${binfile}" "\\\^done" \
+    if [mi_gdb_test "-file-exec-and-symbols ${filename}" "\\\^done" \
        "file-exec-and-symbols operation"] {
 	note "Skipping all other MI tests."
 	return 0
@@ -98,11 +105,11 @@ proc test_exec_and_symbol_mi_operatons {} {
 #            "\\\^done" \
 #            "file-clear operation"
 
-    mi_gdb_test "-file-exec-file ${binfile}" \
+    mi_gdb_test "-file-exec-file ${filename}" \
              "\\\^done" \
              "file-exec-file operation"
 
-    mi_gdb_test "-file-symbol-file ${binfile}" \
+    mi_gdb_test "-file-symbol-file ${filename}" \
              "\\\^done" \
              "file-symbol-file operation"
 
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 00dc0df6bb2..e8925979104 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -558,7 +558,13 @@ mi_gdb_test "-var-update selected_a" \
 	"\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",type_changed=\"true\",new_type=\"int\",new_num_children=\"0\",has_more=\"0\"\}\\\]" \
 	"update selected_a in do_special_tests"
 
-mi_gdb_test "-file-exec-and-symbols ${binfile}" "\\^done" \
+if [is_remote host] {
+    set filename ${testfile}
+} else {
+    set filename ${binfile}
+}
+
+mi_gdb_test "-file-exec-and-symbols ${filename}" "\\^done" \
     "floating varobj invalidation"
 
 mi_delete_varobj selected_a "delete selected_a"
-- 
2.30.2